X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=block%2Fscsi_ioctl.c;h=12a5182173f679f1dc507ba4c2c28b678b8c1dbf;hb=f73be6dedf4fa058ce80846dae604b08fa805ca1;hp=c5b9bcfc0a6d9c3629fa1aa1492fbcba1cb42e32;hpb=c142bda458a9c81097238800e1bd8eeeea09913d;p=linux-2.6-omap-h63xx.git

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index c5b9bcfc0a6..12a5182173f 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);