From 989dbffc97078c04fd9fe099514b24b455b6d83e Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Fri, 29 Aug 2008 16:27:43 +0200
Subject: [PATCH] --- yaml --- r: 109684 b: refs/heads/master c:
 9c2676b61a5a4b6d99e65fb2f438fb3914302eda h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/ata/libata-sff.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 424ad0069dc5..8152e174db38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fd673ecf0378ddeeeb87b3605e50212e0c0ddc6
+refs/heads/master: 9c2676b61a5a4b6d99e65fb2f438fb3914302eda
diff --git a/trunk/drivers/ata/libata-sff.c b/trunk/drivers/ata/libata-sff.c
index 304fdc6f1dc2..2a4c516894f0 100644
--- a/trunk/drivers/ata/libata-sff.c
+++ b/trunk/drivers/ata/libata-sff.c
@@ -1315,11 +1315,6 @@ int ata_sff_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc,
 		break;
 
 	case HSM_ST_ERR:
-		/* make sure qc->err_mask is available to
-		 * know what's wrong and recover
-		 */
-		WARN_ON(!(qc->err_mask & (AC_ERR_DEV | AC_ERR_HSM)));
-
 		ap->hsm_task_state = HSM_ST_IDLE;
 
 		/* complete taskfile transaction */