Skip to contentSkip to conversation

NVMe: Fix scsi mode select llbaa setting

PATCH New Keith Busch 2 participants 2 messages Jan 10, 2015 – Jan 12, 2015

Subsystems (2)
Block layer NVMe
lore
Share & tools
lore

Keith Busch

author
#0 lore raw

PATCH 1/1 NVMe: Fix scsi mode select llbaa setting

It should be a logical bitwise AND, not conditional.

Signed-off-by Keith Busch <keith.busch at intel.com>
---
 drivers/block/nvme-scsi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/nvme-scsi.c +1 -1
index 046ae33..63efe40 100644
@@ -1600,7 +1600,7 @@ static inline void nvme_trans_modesel_get_bd_len(u8 *parm_list, u8 cdb10,
 		/* 10 Byte CDB */
 		*bd_len = (parm_list[MODE_SELECT_10_BD_OFFSET] << 8) +
 			parm_list[MODE_SELECT_10_BD_OFFSET + 1];
-		*llbaa = parm_list[MODE_SELECT_10_LLBAA_OFFSET] &&
+		*llbaa = parm_list[MODE_SELECT_10_LLBAA_OFFSET] &
 				MODE_SELECT_10_LLBAA_MASK;
 	} else {
 		/* 6 Byte CDB */
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 NVMe: Fix scsi mode select llbaa setting

Quoted 7 lines · Keith Busch

It should be a logical bitwise AND, not conditional.

Signed-off-by Keith Busch <keith.busch at intel.com>
---
 drivers/block/nvme-scsi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Acked-by Vishal Verma <vishal.l.verma at linux.intel.com>

Thanks, good catch!

Quoted 13 lines
drivers/block/nvme-scsi.c +1 -1
index 046ae33..63efe40 100644
@@ -1600,7 +1600,7 @@ static inline void nvme_trans_modesel_get_bd_len(u8 *parm_list, u8 cdb10,
 		/* 10 Byte CDB */
 		*bd_len = (parm_list[MODE_SELECT_10_BD_OFFSET] << 8) +
 			parm_list[MODE_SELECT_10_BD_OFFSET + 1];
-		*llbaa = parm_list[MODE_SELECT_10_LLBAA_OFFSET] &&
+		*llbaa = parm_list[MODE_SELECT_10_LLBAA_OFFSET] &
 				MODE_SELECT_10_LLBAA_MASK;
 	} else {
 		/* 6 Byte CDB */