Merge branch 'upstream'

1 files changed, 7 insertions, 9 deletions

diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index 63911f16b6ec..8f41702275db 100644
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
@@ -399,7 +399,8 @@ static void pdc_eng_timeout(struct ata_port *ap)
         case ATA_PROT_DMA:
         case ATA_PROT_NODATA:
                 printk(KERN_ERR "ata%u: command timeout\n", ap->id);
-                ata_qc_complete(qc, ata_wait_idle(ap) | ATA_ERR);
+                drv_stat = ata_wait_idle(ap);
+                ata_qc_complete(qc, __ac_err_mask(drv_stat));
                 break;
 
         default:
@@ -408,7 +409,7 @@ static void pdc_eng_timeout(struct ata_port *ap)
                 printk(KERN_ERR "ata%u: unknown timeout, cmd 0x%x stat 0x%x\n",
                        ap->id, qc->tf.command, drv_stat);
 
-                ata_qc_complete(qc, drv_stat);
+                ata_qc_complete(qc, ac_err_mask(drv_stat));
                 break;
         }
 
@@ -420,24 +421,21 @@ out:
 static inline unsigned int pdc_host_intr( struct ata_port *ap,
                                           struct ata_queued_cmd *qc)
 {
-        u8 status;
-        unsigned int handled = 0, have_err = 0;
+        unsigned int handled = 0, err_mask = 0;
         u32 tmp;
         void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr + PDC_GLOBAL_CTL;
 
         tmp = readl(mmio);
         if (tmp & PDC_ERR_MASK) {
-                have_err = 1;
+                err_mask = AC_ERR_DEV;
                 pdc_reset_port(ap);
         }
 
         switch (qc->tf.protocol) {
         case ATA_PROT_DMA:
         case ATA_PROT_NODATA:
-                status = ata_wait_idle(ap);
-                if (have_err)
-                        status |= ATA_ERR;
-                ata_qc_complete(qc, status);
+                err_mask |= ac_err_mask(ata_wait_idle(ap));
+                ata_qc_complete(qc, err_mask);
                 handled = 1;
                 break;