Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert previous as it does not completely solve the problem of detaching a wsdisplay device

This commit is contained in:
jmcneill 2019-01-30 10:54:52 +00:00
parent 539951b361
commit d4afd86dec
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/wscons/wsdisplay.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsdisplay.c,v 1.150 2019/01/30 02:43:47 jmcneill Exp $ */
/* $NetBSD: wsdisplay.c,v 1.151 2019/01/30 10:54:52 jmcneill Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.150 2019/01/30 02:43:47 jmcneill Exp $");
__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.151 2019/01/30 10:54:52 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "opt_wsdisplay_compat.h"
@ -966,12 +966,10 @@ wsdisplay_preattach(const struct wsscreen_descr *type, void *cookie,
void
wsdisplay_cndetach(void)
{
if (wsdisplay_console_initted > 0) {
cn_tab = wsdisplay_ocn;
wsdisplay_console_initted = 0;
wsdisplay_console_attached = 0;
wsdisplay_console_device = NULL;
}
KASSERT(wsdisplay_console_initted == 2);
cn_tab = wsdisplay_ocn;
wsdisplay_console_initted = 0;
}
/*