isci: Fixed BUG_ON in isci_abort_task_process_cb callback.
authorJeff Skirvin <jeffrey.d.skirvin@intel.com>
Fri, 4 Mar 2011 22:06:58 +0000 (14:06 -0800)
committerDan Williams <dan.j.williams@intel.com>
Sun, 3 Jul 2011 10:55:30 +0000 (03:55 -0700)
The request may be in the "aborted" or the "completed" state when
performing a task management operation on it.

Signed-off-by: Jeff Skirvin <jeffrey.d.skirvin@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
drivers/scsi/isci/task.c

index c2d74c3929fb58b243820edf948583e58bbbc22d..a1234e42937e210f30e073e5be64392ca74a185f 100644 (file)
@@ -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: