diff options
author | Stephen M. Cameron <StephenM.Cameron> | 2011-01-07 11:55:48 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2011-01-24 12:33:54 -0500 |
commit | 1d5e2ed0805bf426226b7daa54b3e60af78baa10 (patch) | |
tree | 432fd56574cf2c34c7f1fb85e6587a9b1977b259 /drivers/scsi | |
parent | c4f8a299d04bd083643ba93e982ab910219dd1f0 (diff) |
[SCSI] hpsa: Fix problem that CMD_UNABORTABLE command status was treated as unknown
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/hpsa.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index c6c13b0c68eb..5828bcb82964 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c | |||
@@ -1152,6 +1152,10 @@ static void complete_scsi_command(struct CommandList *cp, | |||
1152 | cmd->result = DID_TIME_OUT << 16; | 1152 | cmd->result = DID_TIME_OUT << 16; |
1153 | dev_warn(&h->pdev->dev, "cp %p timedout\n", cp); | 1153 | dev_warn(&h->pdev->dev, "cp %p timedout\n", cp); |
1154 | break; | 1154 | break; |
1155 | case CMD_UNABORTABLE: | ||
1156 | cmd->result = DID_ERROR << 16; | ||
1157 | dev_warn(&h->pdev->dev, "Command unabortable\n"); | ||
1158 | break; | ||
1155 | default: | 1159 | default: |
1156 | cmd->result = DID_ERROR << 16; | 1160 | cmd->result = DID_ERROR << 16; |
1157 | dev_warn(&h->pdev->dev, "cp %p returned unknown status %x\n", | 1161 | dev_warn(&h->pdev->dev, "cp %p returned unknown status %x\n", |
@@ -1317,6 +1321,9 @@ static void hpsa_scsi_interpret_error(struct CommandList *cp) | |||
1317 | case CMD_TIMEOUT: | 1321 | case CMD_TIMEOUT: |
1318 | dev_warn(d, "cp %p timed out\n", cp); | 1322 | dev_warn(d, "cp %p timed out\n", cp); |
1319 | break; | 1323 | break; |
1324 | case CMD_UNABORTABLE: | ||
1325 | dev_warn(d, "Command unabortable\n"); | ||
1326 | break; | ||
1320 | default: | 1327 | default: |
1321 | dev_warn(d, "cp %p returned unknown status %x\n", cp, | 1328 | dev_warn(d, "cp %p returned unknown status %x\n", cp, |
1322 | ei->CommandStatus); | 1329 | ei->CommandStatus); |