diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
| commit | f11cbd74c5ff3614f6390b4de67a6ffdc614c378 (patch) | |
| tree | 6a30920ade9eeaac5bf6d6263b5d09712e882eb0 /drivers/net/niu.c | |
| parent | 429c42c9d246f5bda868495c09974312a0177328 (diff) | |
| parent | aea187c46f7d03ce985e55eb1398d0776a15b928 (diff) | |
Merge branch 'master' into for-2.6.34
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 8ce58c4c7dd..2aed2b382c4 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; |