From e8c321c92f3455c73fa431bbb7a3a62e60a97f8c Mon Sep 17 00:00:00 2001 From: Nate Lawson Date: Wed, 29 Oct 2003 20:48:13 +0000 Subject: [PATCH] Fix a panic that occurs when resuming. For some reason, sc->cur_scp is NULL. Submitted by: Andrew Thompson --- sys/dev/syscons/syscons.c | 3 +++ sys/isa/syscons_isa.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 17daf5d5938..da76ed360ea 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -2147,6 +2147,9 @@ sc_switch_scr(sc_softc_t *sc, u_int next_scr) DPRINTF(5, ("sc0: sc_switch_scr() %d ", next_scr + 1)); + if (sc->cur_scp == NULL) + return (0); + /* prevent switch if previously requested */ if (sc->flags & SC_SCRN_VTYLOCK) { sc_bell(sc->cur_scp, sc->cur_scp->bell_pitch, diff --git a/sys/isa/syscons_isa.c b/sys/isa/syscons_isa.c index d88da8951ec..58118d2b508 100644 --- a/sys/isa/syscons_isa.c +++ b/sys/isa/syscons_isa.c @@ -108,6 +108,10 @@ scsuspend(device_t dev) sc_softc_t *sc; sc = &main_softc; + + if (sc->cur_scp == NULL) + return (0); + sc_cur_scr = sc->cur_scp->index; if (sc_no_suspend_vtswitch)