summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorKeith Busch <keith.busch@intel.com>2015-01-10 00:52:08 +0100
committerKeith Busch <keith.busch@intel.com>2015-02-20 00:15:37 +0100
commit9ac16938ab784101631c32c6de825f7ebea08a48 (patch)
tree8ff5c99e1dfc169f47524176b8e8bcd3e995a07c /drivers/block
parentNVMe: Fix potential corruption during shutdown (diff)
downloadlinux-9ac16938ab784101631c32c6de825f7ebea08a48.tar.xz
linux-9ac16938ab784101631c32c6de825f7ebea08a48.zip
NVMe: Fix scsi mode select llbaa setting
It should be a logical bitwise AND, not conditional. Signed-off-by: Keith Busch <keith.busch@intel.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/nvme-scsi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/nvme-scsi.c b/drivers/block/nvme-scsi.c
index 5cc907648742..e10196e0182d 100644
--- a/drivers/block/nvme-scsi.c
+++ b/drivers/block/nvme-scsi.c
@@ -1612,7 +1612,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 */