diff options
| author |   Ram Vepa <ram.vepa@neterion.com> | 2010-01-19 12:36:20 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-01-19 12:36:20 -0800 |
| commit | 2d146eb172d5f754e3973a3f761f7619ebb12df9 (patch) | |
| tree | 56eb5b1dc417c16ea139ade9b531ea77a5c774e8 /drivers/net/s2io.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (diff) | |
| download | linux-dev-2d146eb172d5f754e3973a3f761f7619ebb12df9.tar.xz linux-dev-2d146eb172d5f754e3973a3f761f7619ebb12df9.zip | |
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>
Diffstat (limited to 'drivers/net/s2io.c')
| -rw-r--r-- | drivers/net/s2io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index cc4218667cba..3c4836d0898f 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; } |