diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-05 19:09:46 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-05 19:09:46 -0500 |
| commit | ec0bf39a471bf6fcd01def2bd677128cea940b73 (patch) | |
| tree | 0d98b304d97605613a14329b40ed8cbb88296528 /block | |
| parent | bf83c2a315637dee8a8b5c2221ce5030cc38c6db (diff) | |
| parent | d32adcb85c74fd81963714689842993e7014515f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (73 commits)
[SCSI] aic79xx: Add ASC-29320LPE ids to driver
[SCSI] stex: version update
[SCSI] stex: change wait loop code
[SCSI] stex: add new device type support
[SCSI] stex: update device id info
[SCSI] stex: adjust default queue length
[SCSI] stex: add value check in hard reset routine
[SCSI] stex: fix controller_info command handling
[SCSI] stex: fix biosparam calculation
[SCSI] megaraid: fix MMIO casts
[SCSI] tgt: fix undefined flush_dcache_page() problem
[SCSI] libsas: better error handling in sas_expander.c
[SCSI] lpfc 8.1.11 : Change version number to 8.1.11
[SCSI] lpfc 8.1.11 : Misc Fixes
[SCSI] lpfc 8.1.11 : Add soft_wwnn sysfs attribute, rename soft_wwn_enable
[SCSI] lpfc 8.1.11 : Removed decoding of PCI Subsystem Id
[SCSI] lpfc 8.1.11 : Add MSI (Message Signalled Interrupts) support
[SCSI] lpfc 8.1.11 : Adjust LOG_FCP logging
[SCSI] lpfc 8.1.11 : Fix Memory leaks
[SCSI] lpfc 8.1.11 : Fix lpfc_multi_ring_support
...
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 5493c2fbbab1..b3e210723a71 100644 --- 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, | |||
| 277 | if (rq->bio) | 277 | if (rq->bio) |
| 278 | blk_queue_bounce(q, &rq->bio); | 278 | blk_queue_bounce(q, &rq->bio); |
| 279 | 279 | ||
| 280 | rq->timeout = (hdr->timeout * HZ) / 1000; | 280 | rq->timeout = jiffies_to_msecs(hdr->timeout); |
| 281 | if (!rq->timeout) | 281 | if (!rq->timeout) |
| 282 | rq->timeout = q->sg_timeout; | 282 | rq->timeout = q->sg_timeout; |
| 283 | if (!rq->timeout) | 283 | if (!rq->timeout) |