diff options
Diffstat (limited to 'block/scsi_ioctl.c')
| -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 2dc326421a24..ac63964b7242 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c | |||
| @@ -304,7 +304,7 @@ static int sg_io(struct file *file, request_queue_t *q, | |||
| 304 | if (rq->bio) | 304 | if (rq->bio) |
| 305 | blk_queue_bounce(q, &rq->bio); | 305 | blk_queue_bounce(q, &rq->bio); |
| 306 | 306 | ||
| 307 | rq->timeout = (hdr->timeout * HZ) / 1000; | 307 | rq->timeout = jiffies_to_msecs(hdr->timeout); |
| 308 | if (!rq->timeout) | 308 | if (!rq->timeout) |
| 309 | rq->timeout = q->sg_timeout; | 309 | rq->timeout = q->sg_timeout; |
| 310 | if (!rq->timeout) | 310 | if (!rq->timeout) |