From bf43181921ef0b32ef22eb0d1bd68c56cdad9f0e Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Mon, 23 Jan 2006 13:09:36 +0900
Subject: [PATCH] --- yaml --- r: 21790 b: refs/heads/master c:
 284b6481cc7112ca6a9e60b7a9b650fba3bf0492 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/scsi/ahci.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fe1bb04a02f5..4a36c40771e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e436af9326f5cc2e07d76505154ffddfb04b485
+refs/heads/master: 284b6481cc7112ca6a9e60b7a9b650fba3bf0492
diff --git a/trunk/drivers/scsi/ahci.c b/trunk/drivers/scsi/ahci.c
index 30676b0eb366..a168b525d079 100644
--- a/trunk/drivers/scsi/ahci.c
+++ b/trunk/drivers/scsi/ahci.c
@@ -721,7 +721,7 @@ static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc)
 		ahci_restart_port(ap, status);
 
 		if (qc) {
-			qc->err_mask |= AC_ERR_OTHER;
+			qc->err_mask |= err_mask;
 			ata_qc_complete(qc);
 		}
 	}