From owner-svn-src-projects@FreeBSD.ORG  Fri Nov  4 01:58:55 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8D04D106566C;
	Fri,  4 Nov 2011 01:58:55 +0000 (UTC)
	(envelope-from ambrisko@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7D8898FC0C;
	Fri,  4 Nov 2011 01:58:55 +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 pA41wto5095947;
	Fri, 4 Nov 2011 01:58:55 GMT (envelope-from ambrisko@svn.freebsd.org)
Received: (from ambrisko@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA41wthw095945;
	Fri, 4 Nov 2011 01:58:55 GMT (envelope-from ambrisko@svn.freebsd.org)
Message-Id: <201111040158.pA41wthw095945@svn.freebsd.org>
From: Doug Ambrisko <ambrisko@FreeBSD.org>
Date: Fri, 4 Nov 2011 01:58:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227067 - projects/head_mfi/sys/dev/mpt
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Nov 2011 01:58:55 -0000

Author: ambrisko
Date: Fri Nov  4 01:58:55 2011
New Revision: 227067
URL: http://svn.freebsd.org/changeset/base/227067

Log:
  Change mpt(4) probe to be an exact match to a PCI device ID.  The current
  code makes the mpt(4) check for 0x005A and mistakenly attach to a mfi(4)
  device 0x005B.  Without this fix, mpt(4) will panic if this mfi(4) card
  is in the system.
  
  Reviewed by:	mjacob

Modified:
  projects/head_mfi/sys/dev/mpt/mpt_pci.c

Modified: projects/head_mfi/sys/dev/mpt/mpt_pci.c
==============================================================================
--- projects/head_mfi/sys/dev/mpt/mpt_pci.c	Thu Nov  3 21:57:02 2011	(r227066)
+++ projects/head_mfi/sys/dev/mpt/mpt_pci.c	Fri Nov  4 01:58:55 2011	(r227067)
@@ -232,7 +232,7 @@ mpt_pci_probe(device_t dev)
 		return (ENXIO);
 	}
 
-	switch ((pci_get_device(dev) & ~1)) {
+	switch (pci_get_device(dev)) {
 	case PCI_PRODUCT_LSI_FC909:
 		desc = "LSILogic FC909 FC Adapter";
 		break;