svn commit: r267342 - head/sys/dev/nvme

[Jim Harris]

Author: jimharris
Date: Tue Jun 10 21:40:43 2014
New Revision: 267342
URL: http://svnweb.freebsd.org/changeset/base/267342

Log:
  Use bitwise OR instead of logical OR when constructing value for
  SET_FEATURES/NUMBER_OF_QUEUES command.
  
  Sponsored by:	Intel
  MFC after:	3 days

Modified:
  head/sys/dev/nvme/nvme_ctrlr_cmd.c

Modified: head/sys/dev/nvme/nvme_ctrlr_cmd.c
==============================================================================
--- head/sys/dev/nvme/nvme_ctrlr_cmd.c	Tue Jun 10 21:20:37 2014	(r267341)
+++ head/sys/dev/nvme/nvme_ctrlr_cmd.c	Tue Jun 10 21:40:43 2014	(r267342)
@@ -205,7 +205,7 @@ nvme_ctrlr_cmd_set_num_queues(struct nvm
 {
 	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);
 }