X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=block%2Fscsi_ioctl.c;h=12a5182173f679f1dc507ba4c2c28b678b8c1dbf;hb=674063c5a5461e39c0eb0b33570d467708ec0ecd;hp=c5b9bcfc0a6d9c3629fa1aa1492fbcba1cb42e32;hpb=f6dc8ccaab6d8f63cbae1e6c73fe972b26f5376c;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);