diff options
Diffstat (limited to 'drivers/scsi/sd.c')
-rw-r--r-- | drivers/scsi/sd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 953773cb26d..a7942e5c8be 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
@@ -1066,12 +1066,13 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode, | |||
1066 | unsigned int cmd, unsigned long arg) | 1066 | unsigned int cmd, unsigned long arg) |
1067 | { | 1067 | { |
1068 | struct gendisk *disk = bdev->bd_disk; | 1068 | struct gendisk *disk = bdev->bd_disk; |
1069 | struct scsi_device *sdp = scsi_disk(disk)->device; | 1069 | struct scsi_disk *sdkp = scsi_disk(disk); |
1070 | struct scsi_device *sdp = sdkp->device; | ||
1070 | void __user *p = (void __user *)arg; | 1071 | void __user *p = (void __user *)arg; |
1071 | int error; | 1072 | int error; |
1072 | 1073 | ||
1073 | SCSI_LOG_IOCTL(1, printk("sd_ioctl: disk=%s, cmd=0x%x\n", | 1074 | SCSI_LOG_IOCTL(1, sd_printk(KERN_INFO, sdkp, "sd_ioctl: disk=%s, " |
1074 | disk->disk_name, cmd)); | 1075 | "cmd=0x%x\n", disk->disk_name, cmd)); |
1075 | 1076 | ||
1076 | /* | 1077 | /* |
1077 | * If we are in the middle of error recovery, don't let anyone | 1078 | * If we are in the middle of error recovery, don't let anyone |