[SCSI] megaraid_sas: Load correct raid context timeout

The following patch for megaraid_sas loads the correct raid context timeout
value for multpathing and clustering.

Signed-off-by: Adam Radford <aradford@gmail.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/scsi/megaraid/megaraid_sas_fp.c b/drivers/scsi/megaraid/megaraid_sas_fp.c
index 2f3bd555ff87..081bfff12d00 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fp.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fp.c
@@ -975,7 +975,10 @@ MR_BuildRaidContext(struct megasas_instance *instance,
                         regSize += stripSize;
         }
 
-        pRAID_Context->timeoutValue     = cpu_to_le16(map->raidMap.fpPdIoTimeoutSec);
+        pRAID_Context->timeoutValue =
+                cpu_to_le16(raid->fpIoTimeoutForLd ?
+                            raid->fpIoTimeoutForLd :
+                            map->raidMap.fpPdIoTimeoutSec);
         if ((instance->pdev->device == PCI_DEVICE_ID_LSI_INVADER) ||
                 (instance->pdev->device == PCI_DEVICE_ID_LSI_FURY))
                 pRAID_Context->regLockFlags = (isRead) ?