Date: Sat, 2 May 2009 18:06:15 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org Subject: svn commit: r191749 - in stable/6/sys: . contrib/pf dev/cxgb dev/dcons Message-ID: <200905021806.n42I6Fmh091535@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marius Date: Sat May 2 18:06:15 2009 New Revision: 191749 URL: http://svn.freebsd.org/changeset/base/191749 Log: MFC: r190756 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: stable/6/sys/ (props changed) stable/6/sys/contrib/pf/ (props changed) stable/6/sys/dev/cxgb/ (props changed) stable/6/sys/dev/dcons/dcons_os.c Modified: stable/6/sys/dev/dcons/dcons_os.c ============================================================================== --- stable/6/sys/dev/dcons/dcons_os.c Sat May 2 16:23:44 2009 (r191748) +++ stable/6/sys/dev/dcons/dcons_os.c Sat May 2 18:06:15 2009 (r191749) @@ -674,8 +674,9 @@ dcons_modevent(module_t mode, int type, case MOD_LOAD: ret = dcons_drv_init(1); #if __FreeBSD_version >= 500000 - if (ret == 0) { + if (ret != -1) dcons_attach(); + if (ret == 0) { dcons_cnprobe(&dcons_consdev); dcons_cninit(&dcons_consdev); cnadd(&dcons_consdev);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905021806.n42I6Fmh091535>