From owner-svn-src-stable-9@FreeBSD.ORG  Sun Jun 17 21:30:25 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4BB9B106564A;
	Sun, 17 Jun 2012 21:30:25 +0000 (UTC)
	(envelope-from mjacob@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 361C78FC15;
	Sun, 17 Jun 2012 21:30:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5HLUPAD033901;
	Sun, 17 Jun 2012 21:30:25 GMT (envelope-from mjacob@svn.freebsd.org)
Received: (from mjacob@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5HLUPjb033899;
	Sun, 17 Jun 2012 21:30:25 GMT (envelope-from mjacob@svn.freebsd.org)
Message-Id: <201206172130.q5HLUPjb033899@svn.freebsd.org>
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Sun, 17 Jun 2012 21:30:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237209 - stable/9/sys/dev/isp
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Jun 2012 21:30:25 -0000

Author: mjacob
Date: Sun Jun 17 21:30:24 2012
New Revision: 237209
URL: http://svn.freebsd.org/changeset/base/237209

Log:
  MFC of 237135
  
  If debug values were set, the default from tval floated
  down and triggered an attempt to set multiple virtual
  ports whether you wanted them or not.

Modified:
  stable/9/sys/dev/isp/isp_pci.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)
  stable/9/sys/dev/isp/   (props changed)

Modified: stable/9/sys/dev/isp/isp_pci.c
==============================================================================
--- stable/9/sys/dev/isp/isp_pci.c	Sun Jun 17 21:28:11 2012	(r237208)
+++ stable/9/sys/dev/isp/isp_pci.c	Sun Jun 17 21:30:24 2012	(r237209)
@@ -483,6 +483,7 @@ isp_get_generic_options(device_t dev, is
 	if (bootverbose) {
 		isp->isp_dblev |= ISP_LOGCONFIG|ISP_LOGINFO;
 	}
+	tval = 0;
 	(void) resource_int_value(device_get_name(dev), device_get_unit(dev), "vports", &tval);
 	if (tval > 0 && tval < 127) {
 		*nvp =  tval;