summaryrefslogtreecommitdiffstats
path: root/sys/dev/dcons
diff options
context:
space:
mode:
authorkan <kan@FreeBSD.org>2009-04-06 02:29:28 +0000
committerkan <kan@FreeBSD.org>2009-04-06 02:29:28 +0000
commit3726ab2d40af5a8c166ee79adddb02209b6818f8 (patch)
treec4b8845872da522a5ea7345ad135c40e81b2d9b4 /sys/dev/dcons
parent0cc8805d6dd747fa707644ca551e93edffbb9eee (diff)
downloadFreeBSD-src-3726ab2d40af5a8c166ee79adddb02209b6818f8.zip
FreeBSD-src-3726ab2d40af5a8c166ee79adddb02209b6818f8.tar.gz
Fix logic in MOD_LOAD handler to call dcons_attach after all successful
dcons_drv_init invocations. Testing return value for 0 does not work for cases where dcons_drv_init was called already as part of low level console initialization.
Diffstat (limited to 'sys/dev/dcons')
-rw-r--r--sys/dev/dcons/dcons_os.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/dcons/dcons_os.c b/sys/dev/dcons/dcons_os.c
index 788a3b3..5bf40f9 100644
--- a/sys/dev/dcons/dcons_os.c
+++ b/sys/dev/dcons/dcons_os.c
@@ -403,8 +403,9 @@ dcons_modevent(module_t mode, int type, void *data)
switch (type) {
case MOD_LOAD:
ret = dcons_drv_init(1);
- if (ret == 0) {
+ if (ret != -1)
dcons_attach();
+ if (ret == 0) {
dcons_cnprobe(&dcons_consdev);
dcons_cninit(&dcons_consdev);
cnadd(&dcons_consdev);
OpenPOWER on IntegriCloud