[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Sat, 01 Jan 2011 17:45:11 +0100
From: roel kluin <roel.kluin@...il.com>
To: nick.cheng@...ca.com.tw, Andrew Morton <akpm@...ux-foundation.org>,
LKML <linux-kernel@...r.kernel.org>, James.Bottomley@...e.de,
linux-scsi@...r.kernel.org
Subject: [PATCH] [SCSI] arcmsr: &/| confusion in arcmsr_build_ccb()
The WRITE_{6,10,12} are defined numbers, so the branch was always taken.
Signed-off-by: Roel Kluin <roel.kluin@...il.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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists