From owner-svn-src-all@FreeBSD.ORG  Fri Mar  6 11:24:42 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 AE6611065674;
	Fri,  6 Mar 2009 11:24:42 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9856F8FC0A;
	Fri,  6 Mar 2009 11:24:42 +0000 (UTC)
	(envelope-from rnoland@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 n26BOgf2017858;
	Fri, 6 Mar 2009 11:24:42 GMT (envelope-from rnoland@svn.freebsd.org)
Received: (from rnoland@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n26BOgvi017857;
	Fri, 6 Mar 2009 11:24:42 GMT (envelope-from rnoland@svn.freebsd.org)
Message-Id: <200903061124.n26BOgvi017857@svn.freebsd.org>
From: Robert Noland <rnoland@FreeBSD.org>
Date: Fri, 6 Mar 2009 11:24:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189447 - head/sys/dev/pci
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: Fri, 06 Mar 2009 11:24:44 -0000

Author: rnoland
Date: Fri Mar  6 11:24:42 2009
New Revision: 189447
URL: http://svn.freebsd.org/changeset/base/189447

Log:
  Invert the logic error for the MSI/MSIX vs INTx case.
  
  Pointyhat to:	me
  
  MFC after:	3 days

Modified:
  head/sys/dev/pci/pci.c

Modified: head/sys/dev/pci/pci.c
==============================================================================
--- head/sys/dev/pci/pci.c	Fri Mar  6 11:15:24 2009	(r189446)
+++ head/sys/dev/pci/pci.c	Fri Mar  6 11:24:42 2009	(r189447)
@@ -2920,7 +2920,7 @@ pci_teardown_intr(device_t dev, device_t
 		return(bus_generic_teardown_intr(dev, child, irq, cookie));
 
 	rid = rman_get_rid(irq);
-	if (rid > 0) {
+	if (rid == 0) {
 		/* Mask INTx */
 		pci_set_command_bit(dev, child, PCIM_CMD_INTxDIS);
 	} else {