From 1fd5921a107d02d05ea738423a7df290aff70711 Mon Sep 17 00:00:00 2001
From: Andrey Mirkin <(amirkin@sw.ru)>
Date: Mon, 16 Oct 2006 12:08:43 +0400
Subject: [PATCH] --- yaml --- r: 40329 b: refs/heads/master c:
 031280f6e73d9177c93333c96e37eb05f2522faa h: refs/heads/master i:   40327:
 a6f75c45c1aad76e9a2be76654609e5335237432 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/scsi/megaraid/megaraid_mbox.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 89044bf7613d..dca4856d49bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fc2aef5227dda464560a3fdafc9f4c7ce10210f
+refs/heads/master: 031280f6e73d9177c93333c96e37eb05f2522faa
diff --git a/trunk/drivers/scsi/megaraid/megaraid_mbox.c b/trunk/drivers/scsi/megaraid/megaraid_mbox.c
index c0edb662d863..7bac86dda88f 100644
--- a/trunk/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/trunk/drivers/scsi/megaraid/megaraid_mbox.c
@@ -884,7 +884,7 @@ megaraid_init_mbox(adapter_t *adapter)
 
 	if (((magic64 == HBA_SIGNATURE_64_BIT) &&
 		((adapter->pdev->subsystem_device !=
-		PCI_SUBSYS_ID_MEGARAID_SATA_150_6) ||
+		PCI_SUBSYS_ID_MEGARAID_SATA_150_6) &&
 		(adapter->pdev->subsystem_device !=
 		PCI_SUBSYS_ID_MEGARAID_SATA_150_4))) ||
 		(adapter->pdev->vendor == PCI_VENDOR_ID_LSI_LOGIC &&