projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[firefly-linux-kernel-4.4.55.git]
/
block
/
scsi_ioctl.c
diff --git
a/block/scsi_ioctl.c
b/block/scsi_ioctl.c
index 5493c2fbbab177335814a24362b95763eb5dc820..b3e210723a71f637605852b7d8136ef594af95d2 100644
(file)
--- a/
block/scsi_ioctl.c
+++ b/
block/scsi_ioctl.c
@@
-277,7
+277,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)