1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 4d72831eafe5..2c2041ca4b70 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -880,7 +880,7 @@ static int sd_setup_flush_cmnd(struct scsi_cmnd *cmd)
         cmd->transfersize = 0;
         cmd->allowed = SD_MAX_RETRIES;
 
-        rq->timeout *= SD_FLUSH_TIMEOUT_MULTIPLIER;
+        rq->timeout = rq->q->rq_timeout * SD_FLUSH_TIMEOUT_MULTIPLIER;
         return BLKPREP_OK;
 }