Merge tag 'for-linus-20160324' of git://git.infradead.org/linux-mtd

[mirror_ubuntu-artful-kernel.git] / drivers / ata / libata-scsi.c

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index e417e1a1d02c568595fa465682ade483a9d0645a..567859ce0512f8e61a46b4c10d9aa3b788493617 100644 (file)
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -174,13 +174,13 @@ static ssize_t ata_scsi_park_show(struct device *device,
        struct ata_port *ap;
        struct ata_link *link;
        struct ata_device *dev;
-       unsigned long flags, now;
+       unsigned long now;
        unsigned int uninitialized_var(msecs);
        int rc = 0;
 
        ap = ata_shost_to_port(sdev->host);
 
-       spin_lock_irqsave(ap->lock, flags);
+       spin_lock_irq(ap->lock);
        dev = ata_scsi_find_dev(ap, sdev);
        if (!dev) {
                rc = -ENODEV;