1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index a454f94623d..17ce7abe17e 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -1016,7 +1016,8 @@ static int megasas_slave_configure(struct scsi_device *sdev)
          * The RAID firmware may require extended timeouts.
          */
         if (sdev->channel >= MEGASAS_MAX_PD_CHANNELS)
-                sdev->timeout = MEGASAS_DEFAULT_CMD_TIMEOUT * HZ;
+                blk_queue_rq_timeout(sdev->request_queue,
+                                     MEGASAS_DEFAULT_CMD_TIMEOUT * HZ);
         return 0;
 }