diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-11 01:55:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-11 01:55:03 -0500 |
| commit | d4a66e752d0b19934dd208884f8605fe385aaaa9 (patch) | |
| tree | 72fb727be1d7636aae9cddfe9aa93ac9dec75daf /drivers/net/niu.c | |
| parent | bdbec4b86ee99b020e159f9bd604003a3ae3b0ab (diff) | |
| parent | fa15e99b6bb44aa86b241a43ca8c509e91f80153 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/benet/be_cmds.h
include/linux/sysctl.h
Diffstat (limited to 'drivers/net/niu.c')
| -rw-r--r-- | drivers/net/niu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/niu.c b/drivers/net/niu.c index 920f0ecf7a0a..0e260cfbff7b 100644 --- a/drivers/net/niu.c +++ b/drivers/net/niu.c | |||
| @@ -2844,7 +2844,7 @@ static int tcam_wait_bit(struct niu *np, u64 bit) | |||
| 2844 | break; | 2844 | break; |
| 2845 | udelay(1); | 2845 | udelay(1); |
| 2846 | } | 2846 | } |
| 2847 | if (limit < 0) | 2847 | if (limit <= 0) |
| 2848 | return -ENODEV; | 2848 | return -ENODEV; |
| 2849 | 2849 | ||
| 2850 | return 0; | 2850 | return 0; |