[src/trunk]: src/sys/dev/wscons Call cn_halt on the old console device

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

details:   https://anonhg.NetBSD.org/src/rev/6fa05b1739b1
branches:  trunk
changeset: 962496:6fa05b1739b1
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Jul 23 15:55:49 2019 +0000

description:
Call cn_halt on the old console device

diffstat:

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

diffs (31 lines):

diff -r edf82260f5ca -r 6fa05b1739b1 sys/dev/wscons/wsdisplay.c
--- a/sys/dev/wscons/wsdisplay.c        Tue Jul 23 15:29:24 2019 +0000
+++ b/sys/dev/wscons/wsdisplay.c        Tue Jul 23 15:55:49 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay.c,v 1.154 2019/02/07 06:10:29 mlelstv Exp $ */
+/* $NetBSD: wsdisplay.c,v 1.155 2019/07/23 15:55:49 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.154 2019/02/07 06:10:29 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.155 2019/07/23 15:55:49 jmcneill Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_wsdisplay_compat.h"
@@ -930,8 +930,11 @@
                                                                  ccol, crow,
                                                                  defattr);
 
-       if (cn_tab != &wsdisplay_cons)
+       if (cn_tab != &wsdisplay_cons) {
+               if (cn_tab != NULL && cn_tab->cn_halt != NULL)
+                       cn_tab->cn_halt(cn_tab->cn_dev);
                wsdisplay_ocn = cn_tab;
+       }
        cn_tab = &wsdisplay_cons;
        wsdisplay_console_initted = 2;
 }