Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-bionic-kernel.git] / drivers / ide / ide-floppy_ioctl.c

diff --git a/drivers/ide/ide-floppy_ioctl.c b/drivers/ide/ide-floppy_ioctl.c
index d267b7affad63fab887a10585e647cec6eb98020..a22ca846701080d3721ef32fc72dc9b3038b02fd 100644 (file)
--- a/drivers/ide/ide-floppy_ioctl.c
+++ b/drivers/ide/ide-floppy_ioctl.c
@@ -292,8 +292,7 @@ int ide_floppy_ioctl(ide_drive_t *drive, struct block_device *bdev,
         * and CDROM_SEND_PACKET (legacy) ioctls
         */
        if (cmd != CDROM_SEND_PACKET && cmd != SCSI_IOCTL_SEND_COMMAND)
-               err = scsi_cmd_ioctl(bdev->bd_disk->queue, bdev->bd_disk,
-                               mode, cmd, argp);
+               err = scsi_cmd_blk_ioctl(bdev, mode, cmd, argp);
 
        if (err == -ENOTTY)
                err = generic_ide_ioctl(drive, bdev, cmd, arg);