diff options
Diffstat (limited to 'block')
| -rw-r--r-- | block/scsi_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index e55a75621437..dcd9c71fe8d3 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c | |||
| @@ -303,7 +303,7 @@ static int sg_io(struct file *file, request_queue_t *q, | |||
| 303 | if (rq->bio) | 303 | if (rq->bio) |
| 304 | blk_queue_bounce(q, &rq->bio); | 304 | blk_queue_bounce(q, &rq->bio); |
| 305 | 305 | ||
| 306 | rq->timeout = (hdr->timeout * HZ) / 1000; | 306 | rq->timeout = jiffies_to_msecs(hdr->timeout); |
| 307 | if (!rq->timeout) | 307 | if (!rq->timeout) |
| 308 | rq->timeout = q->sg_timeout; | 308 | rq->timeout = q->sg_timeout; |
| 309 | if (!rq->timeout) | 309 | if (!rq->timeout) |