diff options
| author | Keith Busch <keith.busch@intel.com> | 2015-01-09 18:52:08 -0500 |
|---|---|---|
| committer | Keith Busch <keith.busch@intel.com> | 2015-02-19 18:15:37 -0500 |
| commit | 9ac16938ab784101631c32c6de825f7ebea08a48 (patch) | |
| tree | 8ff5c99e1dfc169f47524176b8e8bcd3e995a07c /drivers/block | |
| parent | 07836e659c81ec6b0d683dfbf7958339a22a7b69 (diff) | |
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.c | 2 |
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, | |||
| 1612 | /* 10 Byte CDB */ | 1612 | /* 10 Byte CDB */ |
| 1613 | *bd_len = (parm_list[MODE_SELECT_10_BD_OFFSET] << 8) + | 1613 | *bd_len = (parm_list[MODE_SELECT_10_BD_OFFSET] << 8) + |
| 1614 | parm_list[MODE_SELECT_10_BD_OFFSET + 1]; | 1614 | parm_list[MODE_SELECT_10_BD_OFFSET + 1]; |
| 1615 | *llbaa = parm_list[MODE_SELECT_10_LLBAA_OFFSET] && | 1615 | *llbaa = parm_list[MODE_SELECT_10_LLBAA_OFFSET] & |
| 1616 | MODE_SELECT_10_LLBAA_MASK; | 1616 | MODE_SELECT_10_LLBAA_MASK; |
| 1617 | } else { | 1617 | } else { |
| 1618 | /* 6 Byte CDB */ | 1618 | /* 6 Byte CDB */ |