6 files changed, 17 insertions, 20 deletions

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index fb9f69252939..cf39987a31c4 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1430,10 +1430,7 @@ static void ahci_post_internal_cmd(struct ata_queued_cmd *qc)
         void __iomem *mmio = ap->host->iomap[AHCI_PCI_BAR];
         void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
 
-        if (qc->flags & ATA_QCFLAG_FAILED)
-                qc->err_mask |= AC_ERR_OTHER;
-
-        if (qc->err_mask) {
+        if (qc->flags & ATA_QCFLAG_FAILED) {
                 /* make DMA engine forget about the failed command */
                 ahci_stop_engine(port_mmio);
                 ahci_start_engine(port_mmio);
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 96bf86f67388..2f2884b92434 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1270,12 +1270,16 @@ unsigned ata_exec_internal_sg(struct ata_device *dev,
         if (ap->ops->post_internal_cmd)
                 ap->ops->post_internal_cmd(qc);
 
-        if ((qc->flags & ATA_QCFLAG_FAILED) && !qc->err_mask) {
-                if (ata_msg_warn(ap))
-                        ata_dev_printk(dev, KERN_WARNING,
-                                "zero err_mask for failed "
-                                "internal command, assuming AC_ERR_OTHER\n");
-                qc->err_mask |= AC_ERR_OTHER;
+        /* perform minimal error analysis */
+        if (qc->flags & ATA_QCFLAG_FAILED) {
+                if (qc->result_tf.command & (ATA_ERR | ATA_DF))
+                        qc->err_mask |= AC_ERR_DEV;
+
+                if (!qc->err_mask)
+                        qc->err_mask |= AC_ERR_OTHER;
+
+                if (qc->err_mask & ~AC_ERR_OTHER)
+                        qc->err_mask &= ~AC_ERR_OTHER;
         }
 
         /* finish up */
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 185876aba647..0dbee550f9e8 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -1151,7 +1151,9 @@ static unsigned int ata_eh_analyze_tf(struct ata_queued_cmd *qc,
                 return ATA_EH_SOFTRESET;
         }
 
-        if (!(qc->err_mask & AC_ERR_DEV))
+        if (stat & (ATA_ERR | ATA_DF))
+                qc->err_mask |= AC_ERR_DEV;
+        else
                 return 0;
 
         switch (qc->dev->class) {
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index 11c3079ab6cc..ca4092aaae5b 100644
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -488,7 +488,7 @@ static void inic_error_handler(struct ata_port *ap)
 static void inic_post_internal_cmd(struct ata_queued_cmd *qc)
 {
         /* make DMA engine forget about the failed command */
-        if (qc->err_mask)
+        if (qc->flags & ATA_QCFLAG_FAILED)
                 inic_reset_port(inic_port_base(qc->ap));
 }
 
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index a7916d72c4ca..8afde4a9ca7e 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -622,11 +622,8 @@ static void pdc_post_internal_cmd(struct ata_queued_cmd *qc)
 {
         struct ata_port *ap = qc->ap;
 
-        if (qc->flags & ATA_QCFLAG_FAILED)
-                qc->err_mask |= AC_ERR_OTHER;
-
         /* make DMA engine forget about the failed command */
-        if (qc->err_mask)
+        if (qc->flags & ATA_QCFLAG_FAILED)
                 pdc_reset_port(ap);
 }
 
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index 6698c746e624..4f522ec04049 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -924,11 +924,8 @@ static void sil24_post_internal_cmd(struct ata_queued_cmd *qc)
 {
         struct ata_port *ap = qc->ap;
 
-        if (qc->flags & ATA_QCFLAG_FAILED)
-                qc->err_mask |= AC_ERR_OTHER;
-
         /* make DMA engine forget about the failed command */
-        if (qc->err_mask)
+        if (qc->flags & ATA_QCFLAG_FAILED)
                 sil24_init_port(ap);
 }