diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-09-26 21:07:20 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-09-26 21:07:20 -0400 |
| commit | 5905db5ca0ac9a6d5bfe87f86b87cd1bdec3755a (patch) | |
| tree | 6edb13ed37d842ef0b70d072b94e4c78010f90cf /drivers/block/cciss_scsi.c | |
| parent | c5aa1e554a20fb3542c62688ae46049c9225a965 (diff) | |
| parent | 6f0f9b6b3fcfe5e156f20d4f804f0d505c750b3c (diff) | |
Merge remote branch 'origin' into for-next
Diffstat (limited to 'drivers/block/cciss_scsi.c')
| -rw-r--r-- | drivers/block/cciss_scsi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c index 38aa6dda6b8..da3311129a0 100644 --- a/drivers/block/cciss_scsi.c +++ b/drivers/block/cciss_scsi.c @@ -795,6 +795,7 @@ static void complete_scsi_command(CommandList_struct *c, int timeout, } break; case CMD_PROTOCOL_ERR: + cmd->result = DID_ERROR << 16; dev_warn(&h->pdev->dev, "%p has protocol error\n", c); break; |