diff options
| author | Jeff Skirvin <jeffrey.d.skirvin@intel.com> | 2011-03-04 14:06:58 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 03:55:30 -0700 |
| commit | 70957a94d70cb82459bd3aea171c54d0a5cd6dbb (patch) | |
| tree | bcdee1dcc7a57eb1c1d934788207797d21ccefe9 /drivers | |
| parent | c3f42feb0c3d20dc7007336e7de949408b93afef (diff) | |
| download | op-kernel-dev-70957a94d70cb82459bd3aea171c54d0a5cd6dbb.zip op-kernel-dev-70957a94d70cb82459bd3aea171c54d0a5cd6dbb.tar.gz | |
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>
Diffstat (limited to 'drivers')
| -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 c2d74c3..a1234e4 100644 --- a/drivers/scsi/isci/task.c +++ b/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: |
