From: Mike Marciniszyn <mike.marciniszyn@intel.com>
Date: Tue, 15 Sep 2015 14:19:27 +0000 (-0400)
Subject: IB/hfi1: fix sdma_descq_cnt parameter parsing
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=aeef010a0f63ad0a6f993d3da30753e9a8a39ec5;p=linux-beck.git

IB/hfi1: fix sdma_descq_cnt parameter parsing

The boolean tests should have been or-ed.

Reported-by: David Binderman <dcb314@hotmail.com>
Reviewed-by: Jubin John <jubin.john@intel.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
---

diff --git a/drivers/staging/rdma/hfi1/sdma.c b/drivers/staging/rdma/hfi1/sdma.c
index a8c903caecce..7e01f30f67b9 100644
--- a/drivers/staging/rdma/hfi1/sdma.c
+++ b/drivers/staging/rdma/hfi1/sdma.c
@@ -737,7 +737,7 @@ u16 sdma_get_descq_cnt(void)
 	 */
 	if (!is_power_of_2(count))
 		return SDMA_DESCQ_CNT;
-	if (count < 64 && count > 32768)
+	if (count < 64 || count > 32768)
 		return SDMA_DESCQ_CNT;
 	return count;
 }