2 files changed, 10 insertions, 3 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 7f53ea725bce..47c70392ec4d 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -5681,9 +5681,8 @@ int ata_device_add(const struct ata_probe_ent *ent)
                                 ap->ioaddr.bmdma_addr,
                                 irq_line);
 
-                ata_chk_status(ap);
-                host->ops->irq_clear(ap);
-                ata_eh_freeze_port(ap); /* freeze port before requesting IRQ */
+                /* freeze port before requesting IRQ */
+                ata_eh_freeze_port(ap);
         }
 
         /* obtain irq, that may be shared between channels */
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 95ff186f0ccd..10ee22ae5c15 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -700,6 +700,14 @@ void ata_bmdma_freeze(struct ata_port *ap)
                 writeb(ap->ctl, (void __iomem *)ioaddr->ctl_addr);
         else
                 outb(ap->ctl, ioaddr->ctl_addr);
+
+        /* Under certain circumstances, some controllers raise IRQ on
+         * ATA_NIEN manipulation.  Also, many controllers fail to mask
+         * previously pending IRQ on ATA_NIEN assertion.  Clear it.
+         */
+        ata_chk_status(ap);
+
+        ap->ops->irq_clear(ap);
 }
 
 /**