diff options
| author | Mark Kettenis <kettenis@openbsd.org> | 2013-02-23 10:42:34 +0100 |
|---|---|---|
| committer | Mark Kettenis <kettenis@openbsd.org> | 2013-02-23 10:42:34 +0100 |
| commit | 993ec0e1d1762b58c21650a3d01e1600039c3e32 (patch) | |
| tree | 31631d52daba71415f34734b2e11bdcfe2f083b9 /sys/dev/wscons | |
| parent | 3786837b53a9eed6ed89de82ec2d41ef4edf2729 (diff) | |
Don't set cn_tab if we're just overriding the console attachment.
Diffstat (limited to 'sys/dev/wscons')
| -rw-r--r-- | sys/dev/wscons/wsdisplay.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c index ea45c1e3cd3..d957afffa12 100644 --- a/sys/dev/wscons/wsdisplay.c +++ b/sys/dev/wscons/wsdisplay.c @@ -783,7 +783,6 @@ wsdisplay_cnattach(const struct wsscreen_descr *type, void *cookie, int ccol, const struct wsemul_ops *wsemul; const struct wsdisplay_emulops *emulops; - KASSERT(!wsdisplay_console_initted); KASSERT(type->nrows > 0); KASSERT(type->ncols > 0); KASSERT(crow < type->nrows); @@ -808,7 +807,8 @@ wsdisplay_cnattach(const struct wsscreen_descr *type, void *cookie, int ccol, wsdisplay_console_conf.wsemulcookie = (*wsemul->cnattach)(type, cookie, ccol, crow, defattr); - cn_tab = &wsdisplay_cons; + if (!wsdisplay_console_initted) + cn_tab = &wsdisplay_cons; wsdisplay_console_initted = 1; } |