From eab9b24b006fb7276d0687b1d1cdbc6d79bad288 Mon Sep 17 00:00:00 2001 From: Andrey Mirkin Date: Mon, 16 Oct 2006 12:08:43 +0400 Subject: [PATCH] --- yaml --- r: 39676 b: refs/heads/master c: 8741ca71a3f626a56595b88200ebf952ce77ceef h: refs/heads/master 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 8972d4ce8aff..cab0951ab316 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a42bb223f61fbd755d6e61b9b50b9681d68fcae +refs/heads/master: 8741ca71a3f626a56595b88200ebf952ce77ceef 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 &&