From a7496498ca0e7e7a644def6534ca2401e5b4644c Mon Sep 17 00:00:00 2001 From: adam radford Date: Fri, 6 Jan 2012 17:02:26 -0800 Subject: [PATCH] --- yaml --- r: 286341 b: refs/heads/master c: 0d4c24cc1bf62e75fdb31e73c68daa50e0877564 h: refs/heads/master i: 286339: 0132e6900fb68621ab70d995bc73db4dee85d0c6 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/megaraid/megaraid_sas_fp.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 38a8c4aea553..dc22fe4d47a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 775bf2773858c50d2acfcdf71889984be94e7037 +refs/heads/master: 0d4c24cc1bf62e75fdb31e73c68daa50e0877564 diff --git a/trunk/drivers/scsi/megaraid/megaraid_sas_fp.c b/trunk/drivers/scsi/megaraid/megaraid_sas_fp.c index 5255dd688aca..294abb0defa6 100644 --- a/trunk/drivers/scsi/megaraid/megaraid_sas_fp.c +++ b/trunk/drivers/scsi/megaraid/megaraid_sas_fp.c @@ -282,7 +282,9 @@ u8 MR_GetPhyParams(struct megasas_instance *instance, u32 ld, u64 stripRow, else { *pDevHandle = MR_PD_INVALID; /* set dev handle as invalid. */ if ((raid->level >= 5) && - (instance->pdev->device != PCI_DEVICE_ID_LSI_INVADER)) + ((instance->pdev->device != PCI_DEVICE_ID_LSI_INVADER) || + (instance->pdev->device == PCI_DEVICE_ID_LSI_INVADER && + raid->regTypeReqOnRead != REGION_TYPE_UNUSED))) pRAID_Context->regLockFlags = REGION_TYPE_EXCLUSIVE; else if (raid->level == 1) { /* Get alternate Pd. */