diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2013-09-23 18:33:41 (GMT) |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-11-30 22:04:49 (GMT) |
| commit | 2e311fbabdc23b7eaec77313dc3b9a151a5407b5 (patch) | |
| tree | 9b898aa40daf6a6e67eae786397e5ca8cf63b507 | |
| parent | 54b2b50c20a61b51199bedb6e5d2f8ec2568fb43 (diff) | |
| download | linux-2e311fbabdc23b7eaec77313dc3b9a151a5407b5.tar.xz | |
[SCSI] hpsa: do not discard scsi status on aborted commands
We inadvertantly discarded the scsi status for aborted commands.
For some commands (e.g. reads from tape drives) these can't be retried,
and if we discarded the scsi status, the scsi mid layer couldn't notice
anything was wrong and the error was not reported.
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Cc: stable@vger.kernel.org
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
| -rw-r--r-- | drivers/scsi/hpsa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 2336bef..595a2a7 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -1289,7 +1289,7 @@ static void complete_scsi_command(struct CommandList *cp) "has check condition: aborted command: " "ASC: 0x%x, ASCQ: 0x%x\n", cp, asc, ascq); - cmd->result = DID_SOFT_ERROR << 16; + cmd->result |= DID_SOFT_ERROR << 16; break; } /* Must be some other type of check condition */ |