summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-04 17:19:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-04 17:19:18 -0700
commitf1b134fdf6d36c975b4a66cf952565cd73aebdba (patch)
treef7524266c501c9196106cd14222ab5e8c4f3004f /block
parent7274264f60cc0b71389efed286001ff0860c3141 (diff)
parente8bac9e0647dd04c83fd0bfe7cdfe2f6dfb100d0 (diff)
downloadlinux-f1b134fdf6d36c975b4a66cf952565cd73aebdba.tar.gz
linux-f1b134fdf6d36c975b4a66cf952565cd73aebdba.tar.bz2
linux-f1b134fdf6d36c975b4a66cf952565cd73aebdba.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] scsi_transport_spi: fix oops in revalidate [SCSI] ses: fix VPD inquiry overrun [SCSI] block: Fix miscalculation of sg_io timeout in CDROM_SEND_PACKET handler. [SCSI] hptiop: add more PCI device IDs
Diffstat (limited to 'block')
-rw-r--r--block/scsi_ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index c5b9bcfc0a6d..12a5182173f6 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -518,7 +518,7 @@ int scsi_cmd_ioctl(struct file *file, struct request_queue *q,
hdr.sbp = cgc.sense;
if (hdr.sbp)
hdr.mx_sb_len = sizeof(struct request_sense);
- hdr.timeout = cgc.timeout;
+ hdr.timeout = jiffies_to_msecs(cgc.timeout);
hdr.cmdp = ((struct cdrom_generic_command __user*) arg)->cmd;
hdr.cmd_len = sizeof(cgc.cmd);