From owner-svn-src-all@FreeBSD.ORG  Sat May  2 18:06:15 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 959D91065675;
	Sat,  2 May 2009 18:06:15 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 82A128FC15;
	Sat,  2 May 2009 18:06:15 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n42I6FGe091536;
	Sat, 2 May 2009 18:06:15 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n42I6Fmh091535;
	Sat, 2 May 2009 18:06:15 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <200905021806.n42I6Fmh091535@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 2 May 2009 18:06:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191749 - in stable/6/sys: . contrib/pf dev/cxgb
	dev/dcons
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 May 2009 18:06:16 -0000

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);