svn commit: r190756 - head/sys/dev/dcons

[Alexander Kabaev]

Author: kan
Date: Mon Apr  6 02:29:28 2009
New Revision: 190756
URL: http://svn.freebsd.org/changeset/base/190756

Log:
  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.

Modified:
  head/sys/dev/dcons/dcons_os.c

Modified: head/sys/dev/dcons/dcons_os.c
==============================================================================
--- head/sys/dev/dcons/dcons_os.c	Mon Apr  6 00:32:54 2009	(r190755)
+++ head/sys/dev/dcons/dcons_os.c	Mon Apr  6 02:29:28 2009	(r190756)
@@ -403,8 +403,9 @@ dcons_modevent(module_t mode, int type, 
 	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);