[src/trunk]: src/sys/dev/wscons Halt the old console on both cnattach and pre...

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

details:   https://anonhg.NetBSD.org/src/rev/1a5e82bf4a5e
branches:  trunk
changeset: 457977:1a5e82bf4a5e
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Thu Jul 25 20:26:39 2019 +0000

description:
Halt the old console on both cnattach and preattach

diffstat:

 sys/dev/wscons/wsdisplay.c |  22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diffs (52 lines):

diff -r 70ed325f65c4 -r 1a5e82bf4a5e sys/dev/wscons/wsdisplay.c
--- a/sys/dev/wscons/wsdisplay.c        Thu Jul 25 20:18:50 2019 +0000
+++ b/sys/dev/wscons/wsdisplay.c        Thu Jul 25 20:26:39 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay.c,v 1.157 2019/07/24 19:40:55 jmcneill Exp $ */
+/* $NetBSD: wsdisplay.c,v 1.158 2019/07/25 20:26:39 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.157 2019/07/24 19:40:55 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.158 2019/07/25 20:26:39 jmcneill Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_wsdisplay_compat.h"
@@ -943,11 +943,12 @@
                                                                  ccol, crow,
                                                                  defattr);
 
-       if (cn_tab != &wsdisplay_cons) {
-               if (cn_tab != NULL && cn_tab->cn_halt != NULL)
-                       cn_tab->cn_halt(cn_tab->cn_dev);
+       if (cn_tab != &wsdisplay_cons)
                wsdisplay_ocn = cn_tab;
-       }
+
+       if (wsdisplay_ocn != NULL && wsdisplay_ocn->cn_halt != NULL)
+               wsdisplay_ocn->cn_halt(wsdisplay_ocn->cn_dev);
+
        cn_tab = &wsdisplay_cons;
        wsdisplay_console_initted = 2;
 }
@@ -974,11 +975,12 @@
                                                                  ccol, crow,
                                                                  defattr);
 
-       if (cn_tab != &wsdisplay_cons) {
-               if (cn_tab != NULL && cn_tab->cn_halt != NULL)
-                       cn_tab->cn_halt(cn_tab->cn_dev);
+       if (cn_tab != &wsdisplay_cons)
                wsdisplay_ocn = cn_tab;
-       }
+
+       if (wsdisplay_ocn != NULL && wsdisplay_ocn->cn_halt != NULL)
+               wsdisplay_ocn->cn_halt(wsdisplay_ocn->cn_dev);
+
        cn_tab = &wsdisplay_cons;
        wsdisplay_console_initted = 1;
 }