[src/trunk]: src/sys/dev/wscons Revert previous as it does not completely sol...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/308e62c27a59
branches:  trunk
changeset: 996374:308e62c27a59
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Wed Jan 30 10:54:52 2019 +0000

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

diffstat:

 sys/dev/wscons/wsdisplay.c |  14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diffs (35 lines):

diff -r 45254e54e53d -r 308e62c27a59 sys/dev/wscons/wsdisplay.c
--- a/sys/dev/wscons/wsdisplay.c        Wed Jan 30 10:28:50 2019 +0000
+++ b/sys/dev/wscons/wsdisplay.c        Wed Jan 30 10:54:52 2019 +0000
@@ -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 @@
 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;
 }
 
 /*