1 files changed, 5 insertions, 11 deletions

diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
index 07c110470e25..e9bf44cf4142 100644
--- a/drivers/ata/pata_bf54x.c
+++ b/drivers/ata/pata_bf54x.c
@@ -1400,18 +1400,12 @@ static irqreturn_t bfin_ata_interrupt(int irq, void *dev_instance)
         spin_lock_irqsave(&host->lock, flags);
 
         for (i = 0; i < host->n_ports; i++) {
-                struct ata_port *ap;
+                struct ata_port *ap = host->ports[i];
+                struct ata_queued_cmd *qc;
 
-                ap = host->ports[i];
-                if (ap &&
-                    !(ap->flags & ATA_FLAG_DISABLED)) {
-                        struct ata_queued_cmd *qc;
-
-                        qc = ata_qc_from_tag(ap, ap->link.active_tag);
-                        if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING)) &&
-                            (qc->flags & ATA_QCFLAG_ACTIVE))
-                                handled |= bfin_ata_host_intr(ap, qc);
-                }
+                qc = ata_qc_from_tag(ap, ap->link.active_tag);
+                if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING)))
+                        handled |= bfin_ata_host_intr(ap, qc);
         }
 
         spin_unlock_irqrestore(&host->lock, flags);