diff options
author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2011-03-12 04:02:30 -0500 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2011-03-12 04:02:30 -0500 |
commit | 6d9a4f9e21486fa83526a9a9fdf88b9b2cdfd299 (patch) | |
tree | f68adf8d3e17b7f47b04a48d2361efcfa29e813a /drivers/block/cciss_scsi.c | |
parent | fcab1c112ade881d884cd7b8161f7543194d12e1 (diff) |
cciss: fix missed command status value CMD_UNABORTABLE
and fix a nearby typo, "do" that should have been "due"
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/block/cciss_scsi.c')
-rw-r--r-- | drivers/block/cciss_scsi.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c index 3bfbde8b4013..8fa2a2e90b9f 100644 --- a/drivers/block/cciss_scsi.c +++ b/drivers/block/cciss_scsi.c | |||
@@ -833,13 +833,18 @@ static void complete_scsi_command(CommandList_struct *c, int timeout, | |||
833 | break; | 833 | break; |
834 | case CMD_UNSOLICITED_ABORT: | 834 | case CMD_UNSOLICITED_ABORT: |
835 | cmd->result = DID_ABORT << 16; | 835 | cmd->result = DID_ABORT << 16; |
836 | dev_warn(&h->pdev->dev, "%p aborted do to an " | 836 | dev_warn(&h->pdev->dev, "%p aborted due to an " |
837 | "unsolicited abort\n", c); | 837 | "unsolicited abort\n", c); |
838 | break; | 838 | break; |
839 | case CMD_TIMEOUT: | 839 | case CMD_TIMEOUT: |
840 | cmd->result = DID_TIME_OUT << 16; | 840 | cmd->result = DID_TIME_OUT << 16; |
841 | dev_warn(&h->pdev->dev, "%p timedout\n", c); | 841 | dev_warn(&h->pdev->dev, "%p timedout\n", c); |
842 | break; | 842 | break; |
843 | case CMD_UNABORTABLE: | ||
844 | cmd->result = DID_ERROR << 16; | ||
845 | dev_warn(&h->pdev->dev, "c %p command " | ||
846 | "unabortable\n", c); | ||
847 | break; | ||
843 | default: | 848 | default: |
844 | cmd->result = DID_ERROR << 16; | 849 | cmd->result = DID_ERROR << 16; |
845 | dev_warn(&h->pdev->dev, | 850 | dev_warn(&h->pdev->dev, |
@@ -1016,11 +1021,15 @@ cciss_scsi_interpret_error(ctlr_info_t *h, CommandList_struct *c) | |||
1016 | break; | 1021 | break; |
1017 | case CMD_UNSOLICITED_ABORT: | 1022 | case CMD_UNSOLICITED_ABORT: |
1018 | dev_warn(&h->pdev->dev, | 1023 | dev_warn(&h->pdev->dev, |
1019 | "%p aborted do to an unsolicited abort\n", c); | 1024 | "%p aborted due to an unsolicited abort\n", c); |
1020 | break; | 1025 | break; |
1021 | case CMD_TIMEOUT: | 1026 | case CMD_TIMEOUT: |
1022 | dev_warn(&h->pdev->dev, "%p timedout\n", c); | 1027 | dev_warn(&h->pdev->dev, "%p timedout\n", c); |
1023 | break; | 1028 | break; |
1029 | case CMD_UNABORTABLE: | ||
1030 | dev_warn(&h->pdev->dev, | ||
1031 | "%p unabortable\n", c); | ||
1032 | break; | ||
1024 | default: | 1033 | default: |
1025 | dev_warn(&h->pdev->dev, | 1034 | dev_warn(&h->pdev->dev, |
1026 | "%p returned unknown status %x\n", | 1035 | "%p returned unknown status %x\n", |