1 files changed, 4 insertions, 2 deletions

diff --git a/block/bsg.c b/block/bsg.c
index 0676301f16d0..82d58829ba59 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -15,11 +15,13 @@
 #include <linux/blkdev.h>
 #include <linux/poll.h>
 #include <linux/cdev.h>
+#include <linux/jiffies.h>
 #include <linux/percpu.h>
 #include <linux/uio.h>
 #include <linux/idr.h>
 #include <linux/bsg.h>
 #include <linux/smp_lock.h>
+#include <linux/slab.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_ioctl.h>
@@ -197,7 +199,7 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
         rq->cmd_len = hdr->request_len;
         rq->cmd_type = REQ_TYPE_BLOCK_PC;
 
-        rq->timeout = (hdr->timeout * HZ) / 1000;
+        rq->timeout = msecs_to_jiffies(hdr->timeout);
         if (!rq->timeout)
                 rq->timeout = q->sg_timeout;
         if (!rq->timeout)
@@ -259,7 +261,7 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm,
                 return ERR_PTR(ret);
 
         /*
-         * map scatter-gather elements seperately and string them to request
+         * map scatter-gather elements separately and string them to request
          */
         rq = blk_get_request(q, rw, GFP_KERNEL);
         if (!rq)