Merge branch 'upstream'

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/scsi/pdc_adma.c b/drivers/scsi/pdc_adma.c
index e254f1e1bb1c..4daede86f00a 100644
--- a/drivers/scsi/pdc_adma.c
+++ b/drivers/scsi/pdc_adma.c
@@ -464,14 +464,12 @@ static inline unsigned int adma_intr_pkt(struct ata_host_set *host_set)
                         continue;
                 qc = ata_qc_from_tag(ap, ap->active_tag);
                 if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) {
-                        unsigned int err_mask = 0;
-
                         if ((status & (aPERR | aPSD | aUIRQ)))
-                                err_mask = AC_ERR_OTHER;
+                                qc->err_mask |= AC_ERR_OTHER;
                         else if (pp->pkt[0] != cDONE)
-                                err_mask = AC_ERR_OTHER;
+                                qc->err_mask |= AC_ERR_OTHER;
 
-                        ata_qc_complete(qc, err_mask);
+                        ata_qc_complete(qc);
                 }
         }
         return handled;
@@ -501,7 +499,8 @@ static inline unsigned int adma_intr_mmio(struct ata_host_set *host_set)
                 
                                 /* complete taskfile transaction */
                                 pp->state = adma_state_idle;
-                                ata_qc_complete(qc, ac_err_mask(status));
+                                qc->err_mask |= ac_err_mask(status);
+                                ata_qc_complete(qc);
                                 handled = 1;
                         }
                 }