1 files changed, 4 insertions, 14 deletions

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index bd486462951c..318862e8a8a9 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -2355,13 +2355,9 @@ static struct ata_queued_cmd *mv_get_active_qc(struct ata_port *ap)
         if (pp->pp_flags & MV_PP_FLAG_NCQ_EN)
                 return NULL;
         qc = ata_qc_from_tag(ap, ap->link.active_tag);
-        if (qc) {
-                if (qc->tf.flags & ATA_TFLAG_POLLING)
-                        qc = NULL;
-                else if (!(qc->flags & ATA_QCFLAG_ACTIVE))
-                        qc = NULL;
-        }
-        return qc;
+        if (qc && !(qc->tf.flags & ATA_TFLAG_POLLING))
+                return qc;
+        return NULL;
 }
 
 static void mv_pmp_error_handler(struct ata_port *ap)
@@ -2546,9 +2542,7 @@ static void mv_unexpected_intr(struct ata_port *ap, int edma_was_enabled)
         char *when = "idle";
 
         ata_ehi_clear_desc(ehi);
-        if (ap->flags & ATA_FLAG_DISABLED) {
-                when = "disabled";
-        } else if (edma_was_enabled) {
+        if (edma_was_enabled) {
                 when = "EDMA enabled";
         } else {
                 struct ata_queued_cmd *qc = ata_qc_from_tag(ap, ap->link.active_tag);
@@ -2782,10 +2776,6 @@ static void mv_port_intr(struct ata_port *ap, u32 port_cause)
         struct mv_port_priv *pp;
         int edma_was_enabled;
 
-        if (ap->flags & ATA_FLAG_DISABLED) {
-                mv_unexpected_intr(ap, 0);
-                return;
-        }
         /*
          * Grab a snapshot of the EDMA_EN flag setting,
          * so that we have a consistent view for this port,