---

yaml --- r: 254369 b: refs/heads/master c: 70957a9 h: refs/heads/master i: 254367: 1375e7e v: v3
git-mirror · Jul 3, 2011 · 8e08e3b · 8e08e3b
1 parent fa331c5
commit 8e08e3b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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: