From 52c0543b086067cc9cd020ef478d65953fec3179 Mon Sep 17 00:00:00 2001
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Date: Fri, 14 Sep 2012 16:35:10 -0500
Subject: [PATCH] --- yaml --- r: 322982 b: refs/heads/master c:
 2453f5f992717251cfadab6184fbb3ec2f2e8b40 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/block/cciss_scsi.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 411f24945a07..c9b7409d54bd 100644
--- 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
index 38aa6dda6b81..da3311129a0c 100644
--- 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;