diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /drivers/net/s2io.c | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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 ac6189005c79..d1664586e8ff 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, | |||
| 3421 | break; | 3421 | break; |
| 3422 | } | 3422 | } |
| 3423 | } else { | 3423 | } else { |
| 3424 | if (!(val64 & busy_bit)) { | 3424 | if (val64 & busy_bit) { |
| 3425 | ret = SUCCESS; | 3425 | ret = SUCCESS; |
| 3426 | break; | 3426 | break; |
| 3427 | } | 3427 | } |