Home » Mailing list archives » linux-kernel » 2011 » January » 1

[PATCH] [SCSI] arcmsr: &/| confusion in arcmsr_build_ccb()

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: roel kluin
Subject: [PATCH] [SCSI] arcmsr: &/| confusion in arcmsr_build_ccb()
Date: Saturday, January 1, 2011 - 9:45 am

The WRITE_{6,10,12} are defined numbers, so the branch was always taken.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
 drivers/scsi/arcmsr/arcmsr_hba.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

See include/scsi/scsi.h:58-123 for
#define WRITE_6               0x0a
#define WRITE_10              0x2a
#define WRITE_12              0xaa

diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
index 17e3df4..a6e5222 100644
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
@@ -1171,7 +1171,8 @@ static int arcmsr_build_ccb(struct AdapterControlBlock *acb,
 	arcmsr_cdb->msgPages = arccdbsize/0x100 + (arccdbsize % 0x100 ? 1 : 0);
 	if ( arccdbsize > 256)
 		arcmsr_cdb->Flags |= ARCMSR_CDB_FLAG_SGL_BSIZE;
-	if (pcmd->cmnd[0]|WRITE_6 || pcmd->cmnd[0]|WRITE_10 || pcmd->cmnd[0]|WRITE_12 ){
+	if (pcmd->cmnd[0] & WRITE_6 || pcmd->cmnd[0] & WRITE_10 ||
+			pcmd->cmnd[0] & WRITE_12 ){
 		arcmsr_cdb->Flags |= ARCMSR_CDB_FLAG_WRITE;
 	}
 	ccb->arc_cdb_size = arccdbsize;
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH] [SCSI] arcmsr: &/| confusion in arcmsr_build_ccb(), roel kluin, (Sat Jan 1, 9:45 am)
Re: [PATCH] [SCSI] arcmsr: &amp;/| confusion in arcmsr_build_ccb(), Matthew Wilcox, (Sat Jan 1, 10:08 am)
Re: [PATCH] [SCSI] arcmsr: &amp;/| confusion in arcmsr_build_ccb(), Torsten Kaiser, (Sat Jan 1, 10:12 am)
Re: [PATCH] [SCSI] arcmsr: &amp;/| confusion in arcmsr_build_ccb(), Torsten Kaiser, (Sat Jan 1, 10:28 am)
Re: [PATCH] [SCSI] arcmsr: &amp;/| confusion in arcmsr_build_ccb(), roel kluin, (Sat Jan 1, 11:40 am)
Re: [PATCH] [SCSI] arcmsr: &amp;/| confusion in arcmsr_build_ccb(), Matthew Wilcox, (Sat Jan 1, 4:34 pm)
RE: [PATCH] [SCSI] arcmsr: &amp;/| confusion in arcmsr_build_ccb(), NickCheng, (Sun Jan 2, 7:35 pm)
Re: [PATCH] [SCSI] arcmsr: &amp;/| confusion in arcmsr_build_ccb(), Torsten Kaiser, (Sun Jan 2, 10:22 pm)
Re: [PATCH] [SCSI] arcmsr: &amp;/| confusion in arcmsr_build_ccb(), James Bottomley, (Mon Jan 3, 9:43 am)