summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRam Vepa <ram.vepa@neterion.com>2010-01-19 12:36:20 -0800
committerDavid S. Miller <davem@davemloft.net>2010-01-19 12:36:20 -0800
commit2d146eb172d5f754e3973a3f761f7619ebb12df9 (patch)
tree56eb5b1dc417c16ea139ade9b531ea77a5c774e8
parentdad48a4ef20774732e53840f371b0cc27981c43a (diff)
downloadop-kernel-dev-2d146eb172d5f754e3973a3f761f7619ebb12df9.zip
op-kernel-dev-2d146eb172d5f754e3973a3f761f7619ebb12df9.tar.gz
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>
-rw-r--r--drivers/net/s2io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index cc42186..3c4836d 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;
}
OpenPOWER on IntegriCloud