svn commit: r267620 - stable/10/sys/dev/nvme

[Jim Harris]

Author: jimharris
Date: Wed Jun 18 19:32:38 2014
New Revision: 267620
URL: http://svnweb.freebsd.org/changeset/base/267620

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

Modified:
  stable/10/sys/dev/nvme/nvme_ctrlr_cmd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/nvme/nvme_ctrlr_cmd.c
==============================================================================
--- stable/10/sys/dev/nvme/nvme_ctrlr_cmd.c	Wed Jun 18 19:28:55 2014	(r267619)
+++ stable/10/sys/dev/nvme/nvme_ctrlr_cmd.c	Wed Jun 18 19:32:38 2014	(r267620)
@@ -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);
 }