Pull bugzilla-7880 into release branch

[linux-2.6-omap-h63xx.git] / drivers / block / ub.c

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 18c8b6c0db20239ae3095c2547a13cbab66dff5c..8b13d7d2cb636990576342832f5e954f379766e1 100644 (file)
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -1709,7 +1709,7 @@ static int ub_bd_ioctl(struct inode *inode, struct file *filp,
        struct gendisk *disk = inode->i_bdev->bd_disk;
        void __user *usermem = (void __user *) arg;
 
-       return scsi_cmd_ioctl(filp, disk, cmd, usermem);
+       return scsi_cmd_ioctl(filp, disk->queue, disk, cmd, usermem);
 }
 
 /*