diff --git a/[refs] b/[refs]
index 13b565457aaa..521fdd9a99cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 701db69d6647f61e4660c9102d7f2fd5dffc203d
+refs/heads/master: 278efe950988e72e2d0cea35059438fc27035d13
diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c
index 82f566cf75c6..657537f96c3a 100644
--- a/trunk/drivers/scsi/libata-core.c
+++ b/trunk/drivers/scsi/libata-core.c
@@ -4336,7 +4336,8 @@ inline unsigned int ata_host_intr (struct ata_port *ap,
 		       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/trunk/drivers/scsi/sata_mv.c b/trunk/drivers/scsi/sata_mv.c
index ef148acb5eeb..17044168ebfe 100644
--- a/trunk/drivers/scsi/sata_mv.c
+++ b/trunk/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);
 				}
 			}
 		}