From 0ce2e66f4e8262651c228c3fb7b57b1a1a03c161 Mon Sep 17 00:00:00 2001 From: jimharris Date: Wed, 18 Jun 2014 19:32:38 +0000 Subject: MFC r267342: Use bitwise OR instead of logical OR when constructing value for SET_FEATURES/NUMBER_OF_QUEUES command. Sponsored by: Intel --- sys/dev/nvme/nvme_ctrlr_cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } -- cgit v1.1