diff options
| author | jimharris <jimharris@FreeBSD.org> | 2014-06-18 19:32:38 +0000 |
|---|---|---|
| committer | jimharris <jimharris@FreeBSD.org> | 2014-06-18 19:32:38 +0000 |
| commit | 0ce2e66f4e8262651c228c3fb7b57b1a1a03c161 (patch) | |
| tree | 518e270d4e04685aad62c1dad18d5be73bdd38eb | |
| parent | adb3a0aab05d20467f698904501aef5e0ffcbad1 (diff) | |
| download | FreeBSD-src-0ce2e66f4e8262651c228c3fb7b57b1a1a03c161.zip FreeBSD-src-0ce2e66f4e8262651c228c3fb7b57b1a1a03c161.tar.gz | |
MFC r267342:
Use bitwise OR instead of logical OR when constructing value for
SET_FEATURES/NUMBER_OF_QUEUES command.
Sponsored by: Intel
| -rw-r--r-- | sys/dev/nvme/nvme_ctrlr_cmd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/nvme/nvme_ctrlr_cmd.c b/sys/dev/nvme/nvme_ctrlr_cmd.c index 5df753c..e2abf0e 100644 --- a/sys/dev/nvme/nvme_ctrlr_cmd.c +++ b/sys/dev/nvme/nvme_ctrlr_cmd.c @@ -205,7 +205,7 @@ nvme_ctrlr_cmd_set_num_queues(struct nvme_controller *ctrlr, { uint32_t cdw11; - cdw11 = ((num_queues - 1) << 16) || (num_queues - 1); + cdw11 = ((num_queues - 1) << 16) | (num_queues - 1); nvme_ctrlr_cmd_set_feature(ctrlr, NVME_FEAT_NUMBER_OF_QUEUES, cdw11, NULL, 0, cb_fn, cb_arg); } |
