From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 19 Jun 2014 20:18:06 +0000 (-0700)
Subject: Revert "staging: tidspbridge: use safer test on the result of find_first_zero_bit"
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=22b5371412f91ea0e1bf5e1c1dd527eb3eed6dc2;p=openwrt%2Fstaging%2Fblogic.git

Revert "staging: tidspbridge: use safer test on the result of find_first_zero_bit"

This reverts commit cc0be81f00472d782804293766ddd9d1c2b4ebd1, it was
incorrect.

Reported-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c
index 305f3a60db71..9d3044a384ee 100644
--- a/drivers/staging/tidspbridge/rmgr/node.c
+++ b/drivers/staging/tidspbridge/rmgr/node.c
@@ -935,7 +935,7 @@ int node_connect(struct node_object *node1, u32 stream1,
 				 node2_type == NODE_DAISSOCKET)) {
 		/* Find available pipe */
 		pipe_id = find_first_zero_bit(hnode_mgr->pipe_map, MAXPIPES);
-		if (pipe_id >= MAXPIPES) {
+		if (pipe_id == MAXPIPES) {
 			status = -ECONNREFUSED;
 			goto out_unlock;
 		}
@@ -1008,7 +1008,7 @@ int node_connect(struct node_object *node1, u32 stream1,
 			status = -EINVAL;
 			goto out_unlock;
 		}
-		if (chnl_id >= CHNL_MAXCHANNELS) {
+		if (chnl_id == CHNL_MAXCHANNELS) {
 			status = -ECONNREFUSED;
 			goto out_unlock;
 		}