From: Ram Vepa <ram.vepa@neterion.com>
Date: Tue, 19 Jan 2010 20:36:20 +0000 (-0800)
Subject: S2io: two branches the same in wait_for_cmd_complete()
X-Git-Tag: v2.6.33-rc6~29^2~24
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2d146eb172d5f754e3973a3f761f7619ebb12df9;p=~emulex%2Finfiniband.git

S2io: two branches the same in wait_for_cmd_complete()

Fix check to verify if a register bit is set. We have not hit this bug because
wait_for_cmd_complete() is always called with S2IO_BIT_RESET.
Reported by Roel Kluin <roel.kluin@gmail.com>.

Signed-off-by: Ram Vepa <ram.vepa@neterion.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index cc4218667cb..3c4836d0898 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -3421,7 +3421,7 @@ static int wait_for_cmd_complete(void __iomem *addr, u64 busy_bit,
 				break;
 			}
 		} else {
-			if (!(val64 & busy_bit)) {
+			if (val64 & busy_bit) {
 				ret = SUCCESS;
 				break;
 			}