diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-17 12:55:28 (GMT) |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-17 12:55:28 (GMT) |
| commit | 0c929238ca4baefe47f4034732db4c154f2329c6 (patch) | |
| tree | 2636079800fa045501982a70e1be0425c1b968c2 /drivers/block/ub.c | |
| parent | 6d7120a713300283a8b73e7d86cd1bab8b9d1971 (diff) | |
| parent | 78da107a7ed14fbc6ef77ff4c41d92b11edc9036 (diff) | |
| download | linux-fsl-qoriq-0c929238ca4baefe47f4034732db4c154f2329c6.tar.xz | |
Merge branch 'sh/platform-updates' into sh-latest
Diffstat (limited to 'drivers/block/ub.c')
| -rw-r--r-- | drivers/block/ub.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/ub.c b/drivers/block/ub.c index 0e376d4..7333b9e 100644 --- a/drivers/block/ub.c +++ b/drivers/block/ub.c @@ -1744,12 +1744,11 @@ static int ub_bd_release(struct gendisk *disk, fmode_t mode) static int ub_bd_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg) { - struct gendisk *disk = bdev->bd_disk; void __user *usermem = (void __user *) arg; int ret; mutex_lock(&ub_mutex); - ret = scsi_cmd_ioctl(disk->queue, disk, mode, cmd, usermem); + ret = scsi_cmd_blk_ioctl(bdev, mode, cmd, usermem); mutex_unlock(&ub_mutex); return ret; |