From owner-svn-src-head@FreeBSD.ORG  Tue Apr  3 08:28:44 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id F386A106566C;
	Tue,  3 Apr 2012 08:28:43 +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 DF1158FC15;
	Tue,  3 Apr 2012 08:28:43 +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 q338Sh5M039580;
	Tue, 3 Apr 2012 08:28:43 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q338Sh4L039578;
	Tue, 3 Apr 2012 08:28:43 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201204030828.q338Sh4L039578@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Tue, 3 Apr 2012 08:28:43 +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: r233827 - head/sys/dev/mpt
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2012 08:28:44 -0000

Author: marius
Date: Tue Apr  3 08:28:43 2012
New Revision: 233827
URL: http://svn.freebsd.org/changeset/base/233827

Log:
  Fix probing of SAS1068E with a device ID of 0x0059 after r232411.
  Reported by:	infofarmer
  
  MFC after:	3 days

Modified:
  head/sys/dev/mpt/mpt_pci.c

Modified: head/sys/dev/mpt/mpt_pci.c
==============================================================================
--- head/sys/dev/mpt/mpt_pci.c	Tue Apr  3 08:24:32 2012	(r233826)
+++ head/sys/dev/mpt/mpt_pci.c	Tue Apr  3 08:28:43 2012	(r233827)
@@ -141,6 +141,10 @@ __FBSDID("$FreeBSD$");
 #define MPI_MANUFACTPAGE_DEVID_SAS1068A_FB	0x0055
 #endif
 
+#ifndef	MPI_MANUFACTPAGE_DEVID_SAS1068E_FB
+#define	MPI_MANUFACTPAGE_DEVID_SAS1068E_FB	0x0059
+#endif
+
 #ifndef	MPI_MANUFACTPAGE_DEVID_SAS1078DE_FB
 #define	MPI_MANUFACTPAGE_DEVID_SAS1078DE_FB	0x007C
 #endif
@@ -236,6 +240,7 @@ mpt_pci_probe(device_t dev)
 	case MPI_MANUFACTPAGE_DEVID_SAS1068:
 	case MPI_MANUFACTPAGE_DEVID_SAS1068A_FB:
 	case MPI_MANUFACTPAGE_DEVID_SAS1068E:
+	case MPI_MANUFACTPAGE_DEVID_SAS1068E_FB:
 	case MPI_MANUFACTPAGE_DEVID_SAS1078:
 	case MPI_MANUFACTPAGE_DEVID_SAS1078DE_FB:
 		desc = "LSILogic SAS/SATA Adapter";
@@ -419,6 +424,7 @@ mpt_pci_attach(device_t dev)
 	case MPI_MANUFACTPAGE_DEVID_SAS1068:
 	case MPI_MANUFACTPAGE_DEVID_SAS1068A_FB:
 	case MPI_MANUFACTPAGE_DEVID_SAS1068E:
+	case MPI_MANUFACTPAGE_DEVID_SAS1068E_FB:
 		mpt->is_sas = 1;
 		break;
 	default: