diff options
| author | Jeff Skirvin <jeffrey.d.skirvin@intel.com> | 2011-03-04 17:06:58 -0500 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 06:55:30 -0400 |
| commit | 70957a94d70cb82459bd3aea171c54d0a5cd6dbb (patch) | |
| tree | bcdee1dcc7a57eb1c1d934788207797d21ccefe9 | |
| parent | c3f42feb0c3d20dc7007336e7de949408b93afef (diff) | |
isci: Fixed BUG_ON in isci_abort_task_process_cb callback.
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>
| -rw-r--r-- | drivers/scsi/isci/task.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c index c2d74c3929fb..a1234e42937e 100644 --- a/drivers/scsi/isci/task.c +++ b/drivers/scsi/isci/task.c | |||
| @@ -1116,7 +1116,8 @@ static void isci_abort_task_process_cb( | |||
| 1116 | * request state was already set to "aborted" by the abort | 1116 | * request state was already set to "aborted" by the abort |
| 1117 | * task function. | 1117 | * task function. |
| 1118 | */ | 1118 | */ |
| 1119 | BUG_ON(old_request->status != aborted); | 1119 | BUG_ON((old_request->status != aborted) |
| 1120 | && (old_request->status != completed)); | ||
| 1120 | break; | 1121 | break; |
| 1121 | 1122 | ||
| 1122 | case isci_tmf_timed_out: | 1123 | case isci_tmf_timed_out: |