]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
NVMe: Fix scsi mode select llbaa setting
authorKeith Busch <keith.busch@intel.com>
Fri, 9 Jan 2015 23:52:08 +0000 (16:52 -0700)
committerKeith Busch <keith.busch@intel.com>
Thu, 19 Feb 2015 23:15:37 +0000 (16:15 -0700)
It should be a logical bitwise AND, not conditional.

Signed-off-by: Keith Busch <keith.busch@intel.com>
drivers/block/nvme-scsi.c

index 5cc907648742d8d0de96b19587ba45b5bdeb180c..e10196e0182d450667cf886421e9475c218f30c8 100644 (file)
@@ -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 */