---

yaml --- r: 322982 b: refs/heads/master c: 2453f5f h: refs/heads/master v: v3
git-mirror · Sep 18, 2012 · 52c0543 · 52c0543
1 parent 25b9383
commit 52c0543
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bd6efad25d7c1950008e2ab4e2d6796001919fc
+refs/heads/master: 2453f5f992717251cfadab6184fbb3ec2f2e8b40
diff --git a/trunk/drivers/block/cciss_scsi.c b/trunk/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;