From a217f5815bbcf698b81ee071d4a750230e683e5f Mon Sep 17 00:00:00 2001
From: "Moger, Babu" <Babu.Moger@netapp.com>
Date: Tue, 24 Jan 2012 20:38:42 +0000
Subject: [PATCH] --- yaml --- r: 292911 b: refs/heads/master c:
 3384db9eb8b1e4f94a02c2a0ce3c0efe6142f3ba h: refs/heads/master i:   292909:
 7b935e6641f6521b12dd2f6ad03668130365bce3   292907:
 1aae709cd3b2ab7cca89f9e8e70673f27c7aa8a0   292903:
 ee87ac8936cacb5ce2b514c671a8d1f50ac64721   292895:
 c10c2a62cf0236b2cf83e925b69667c324ba77e2 v: v3

---
 [refs]                         | 2 +-
 trunk/include/scsi/scsi_cmnd.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 852819117836..c7924a5b11d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98788a134979fe66c32a1393adf66f7d3faf16ea
+refs/heads/master: 3384db9eb8b1e4f94a02c2a0ce3c0efe6142f3ba
diff --git a/trunk/include/scsi/scsi_cmnd.h b/trunk/include/scsi/scsi_cmnd.h
index a5e885a111df..9be0128bf303 100644
--- a/trunk/include/scsi/scsi_cmnd.h
+++ b/trunk/include/scsi/scsi_cmnd.h
@@ -289,17 +289,17 @@ static inline struct scsi_data_buffer *scsi_prot(struct scsi_cmnd *cmd)
 
 static inline void set_msg_byte(struct scsi_cmnd *cmd, char status)
 {
-	cmd->result |= status << 8;
+	cmd->result = (cmd->result & 0xffff00ff) | (status << 8);
 }
 
 static inline void set_host_byte(struct scsi_cmnd *cmd, char status)
 {
-	cmd->result |= status << 16;
+	cmd->result = (cmd->result & 0xff00ffff) | (status << 16);
 }
 
 static inline void set_driver_byte(struct scsi_cmnd *cmd, char status)
 {
-	cmd->result |= status << 24;
+	cmd->result = (cmd->result & 0x00ffffff) | (status << 24);
 }
 
 #endif /* _SCSI_SCSI_CMND_H */