aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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,
518 hdr.sbp = cgc.sense; 518 hdr.sbp = cgc.sense;
519 if (hdr.sbp) 519 if (hdr.sbp)
520 hdr.mx_sb_len = sizeof(struct request_sense); 520 hdr.mx_sb_len = sizeof(struct request_sense);
521 hdr.timeout = cgc.timeout; 521 hdr.timeout = jiffies_to_msecs(cgc.timeout);
522 hdr.cmdp = ((struct cdrom_generic_command __user*) arg)->cmd; 522 hdr.cmdp = ((struct cdrom_generic_command __user*) arg)->cmd;
523 hdr.cmd_len = sizeof(cgc.cmd); 523 hdr.cmd_len = sizeof(cgc.cmd);
524 524