From: Keith Busch Date: Fri, 9 Jan 2015 23:52:08 +0000 (-0700) Subject: NVMe: Fix scsi mode select llbaa setting X-Git-Tag: v4.9.8~4733^2^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ac16938ab784101631c32c6de825f7ebea08a48;p=platform%2Fkernel%2Flinux-rpi3.git NVMe: Fix scsi mode select llbaa setting It should be a logical bitwise AND, not conditional. Signed-off-by: Keith Busch --- diff --git a/drivers/block/nvme-scsi.c b/drivers/block/nvme-scsi.c index 5cc9076..e10196e 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 */