git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
s390/qeth: fix SETIP command handling
[pandora-kernel.git]
/
drivers
/
block
/
ub.c
diff --git
a/drivers/block/ub.c
b/drivers/block/ub.c
index
0e376d4
..
7333b9e
100644
(file)
--- 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)
{
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);
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;
mutex_unlock(&ub_mutex);
return ret;