drm/amdgpu: Don't default to DC support for Kaveri and older

[mirror_ubuntu-eoan-kernel.git] / drivers / ide / ide-iops.c

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 210a0887dd2957d834dcdf924a11ffe242418382..d55e9ebd56282c4d90212c87b47181720d6d2b48 100644 (file)
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -108,6 +108,7 @@ int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad,
        ide_hwif_t *hwif = drive->hwif;
        const struct ide_tp_ops *tp_ops = hwif->tp_ops;
        unsigned long flags;
+       bool irqs_threaded = force_irqthreads;
        int i;
        u8 stat;
 
@@ -115,8 +116,10 @@ int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad,
        stat = tp_ops->read_status(hwif);
 
        if (stat & ATA_BUSY) {
-               local_save_flags(flags);
-               local_irq_enable_in_hardirq();
+               if (!irqs_threaded) {
+                       local_save_flags(flags);
+                       local_irq_enable_in_hardirq();
+               }
                timeout += jiffies;
                while ((stat = tp_ops->read_status(hwif)) & ATA_BUSY) {
                        if (time_after(jiffies, timeout)) {
@@ -129,12 +132,14 @@ int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad,
                                if ((stat & ATA_BUSY) == 0)
                                        break;
 
-                               local_irq_restore(flags);
+                               if (!irqs_threaded)
+                                       local_irq_restore(flags);
                                *rstat = stat;
                                return -EBUSY;
                        }
                }
-               local_irq_restore(flags);
+               if (!irqs_threaded)
+                       local_irq_restore(flags);
        }
        /*
         * Allow status to settle, then read it again.