Message ID | 1411549247-6511-12-git-send-email-apw@canonical.com |
---|---|
State | New |
Headers | show |
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 2735c50..fb949ee 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -830,7 +830,7 @@ static int sd_setup_write_same_cmnd(struct scsi_device *sdp, struct request *rq) static int scsi_setup_flush_cmnd(struct scsi_device *sdp, struct request *rq) { - rq->timeout *= SD_FLUSH_TIMEOUT_MULTIPLIER; + rq->timeout = rq->q->rq_timeout * SD_FLUSH_TIMEOUT_MULTIPLIER; rq->retries = SD_MAX_RETRIES; rq->cmd[0] = SYNCHRONIZE_CACHE; rq->cmd_len = 10;