From 8e08e3bf93e3a5404e31d93b817237f65be4ec7b Mon Sep 17 00:00:00 2001
From: Jeff Skirvin <jeffrey.d.skirvin@intel.com>
Date: Fri, 4 Mar 2011 14:06:58 -0800
Subject: [PATCH] --- yaml --- r: 254369 b: refs/heads/master c:
 70957a94d70cb82459bd3aea171c54d0a5cd6dbb h: refs/heads/master i:   254367:
 1375e7eb959521d8226b7bcd32967d806b08538f v: v3

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

diff --git a/[refs] b/[refs]
index d1d6624e2030..6d93d4fe5322 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3f42feb0c3d20dc7007336e7de949408b93afef
+refs/heads/master: 70957a94d70cb82459bd3aea171c54d0a5cd6dbb
diff --git a/trunk/drivers/scsi/isci/task.c b/trunk/drivers/scsi/isci/task.c
index c2d74c3929fb..a1234e42937e 100644
--- a/trunk/drivers/scsi/isci/task.c
+++ b/trunk/drivers/scsi/isci/task.c
@@ -1116,7 +1116,8 @@ static void isci_abort_task_process_cb(
 		 * request state was already set to "aborted" by the abort
 		 * task function.
 		 */
-		BUG_ON(old_request->status != aborted);
+		BUG_ON((old_request->status != aborted)
+			&& (old_request->status != completed));
 		break;
 
 	case isci_tmf_timed_out: