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,
         if (rq->bio)
                 blk_queue_bounce(q, &rq->bio);
 
-        rq->timeout = (hdr->timeout * HZ) / 1000;
+        rq->timeout = jiffies_to_msecs(hdr->timeout);
         if (!rq->timeout)
                 rq->timeout = q->sg_timeout;
         if (!rq->timeout)