diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
| commit | f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 (patch) | |
| tree | 4c7abed6047538c13dd024a8ecffd15f31b4609a /drivers/net/niu.c | |
| parent | 84549d239ab9bb2e3a85c6efcf0e6478a38b4260 (diff) | |
| parent | 40aa7030e5213a43e9e0554fd7f95534ea310bf3 (diff) | |
Merge branch 'for-2.6.33' 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; |