Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Nov 2011 01:58:55 +0000 (UTC)
From:      Doug Ambrisko <ambrisko@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r227067 - projects/head_mfi/sys/dev/mpt
Message-ID:  <201111040158.pA41wthw095945@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111040158.pA41wthw095945>