From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 6 Dec 2005 10:01:27 +0000 (-0500)
Subject: [libata] irq-pio: fix breakage related to err_mask merge
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=278efe950988e72e2d0cea35059438fc27035d13;p=deliverable%2Flinux.git

[libata] irq-pio: fix breakage related to err_mask merge
---

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 82f566cf75c6..657537f96c3a 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -4336,7 +4336,8 @@ fsm_start:
 		       ap->id, status, host_stat);
 
 		ap->hsm_task_state = HSM_ST_IDLE;
-		ata_qc_complete(qc, status | ATA_ERR);
+		qc->err_mask |= __ac_err_mask(status);
+		ata_qc_complete(qc);
 		break;
 	default:
 		goto idle_irq;
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
index ef148acb5eeb..17044168ebfe 100644
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -1244,7 +1244,7 @@ static void mv_host_intr(struct ata_host_set *host_set, u32 relevant,
 				/* mark qc status appropriately */
 				if (!(qc->tf.flags & ATA_TFLAG_POLLING)) {
 					qc->err_mask |= err_mask;
-					ata_qc_complete(qc, err_mask);
+					ata_qc_complete(qc);
 				}
 			}
 		}