summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorStephen M. Cameron2011-01-07 17:55:48 +0100
committerJames Bottomley2011-01-24 18:33:54 +0100
commit1d5e2ed0805bf426226b7daa54b3e60af78baa10 (patch)
tree432fd56574cf2c34c7f1fb85e6587a9b1977b259 /drivers/scsi
parent[SCSI] hpsa: fix use of uninitialized variable in hpsa_add_msa2xxx_enclosure_... (diff)
downloadkernel-qcow2-linux-1d5e2ed0805bf426226b7daa54b3e60af78baa10.tar.gz
kernel-qcow2-linux-1d5e2ed0805bf426226b7daa54b3e60af78baa10.tar.xz
kernel-qcow2-linux-1d5e2ed0805bf426226b7daa54b3e60af78baa10.zip
[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.c7
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,
cmd->result = DID_TIME_OUT << 16;
dev_warn(&h->pdev->dev, "cp %p timedout\n", cp);
break;
+ case CMD_UNABORTABLE:
+ cmd->result = DID_ERROR << 16;
+ dev_warn(&h->pdev->dev, "Command unabortable\n");
+ break;
default:
cmd->result = DID_ERROR << 16;
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)
case CMD_TIMEOUT:
dev_warn(d, "cp %p timed out\n", cp);
break;
+ case CMD_UNABORTABLE:
+ dev_warn(d, "Command unabortable\n");
+ break;
default:
dev_warn(d, "cp %p returned unknown status %x\n", cp,
ei->CommandStatus);