More IDE locking fixes. Found by Nick Piggin.

diff --git a/drivers/ide/ioctl.c b/drivers/ide/ioctl.c
index b986555fd4f32b74f1ec972f6751aec481bd3d5e..609ed7dcfa56b9e514f56c2cbbeaacff51d9a485 100644 (file)
--- a/drivers/ide/ioctl.c
+++ b/drivers/ide/ioctl.c
@@ -345,8 +345,9 @@ int ata_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned
                        if (!arg) {
                                if (ide_spin_wait_hwgroup(drive))
                                        return -EBUSY;
-                               else
-                                       return 0;
+                               /* Do nothing, just unlock */
+                               spin_unlock_irq(drive->channel->lock);
+                               return 0;
                        }
 
                        return do_cmd_ioctl(drive, arg);