diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-11 04:17:42 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 04:17:42 -0500 |
| commit | f437e8b53eab92a5829e65781e29aed23d8ffd0c (patch) | |
| tree | 48982c8818a4ac5cddb84ca6a1d55620eb9680ee /drivers/net/sungem_phy.c | |
| parent | 140573d33b703194b7e1893711e78b7f546cca7c (diff) | |
| parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) | |
Merge commit 'v2.6.29-rc4' into sched/core
Diffstat (limited to 'drivers/net/sungem_phy.c')
| -rw-r--r-- | drivers/net/sungem_phy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sungem_phy.c b/drivers/net/sungem_phy.c index 61843fd57525..78f8cee5fd74 100644 --- a/drivers/net/sungem_phy.c +++ b/drivers/net/sungem_phy.c | |||
| @@ -79,7 +79,7 @@ static int reset_one_mii_phy(struct mii_phy* phy, int phy_id) | |||
| 79 | 79 | ||
| 80 | udelay(100); | 80 | udelay(100); |
| 81 | 81 | ||
| 82 | while (limit--) { | 82 | while (--limit) { |
| 83 | val = __phy_read(phy, phy_id, MII_BMCR); | 83 | val = __phy_read(phy, phy_id, MII_BMCR); |
| 84 | if ((val & BMCR_RESET) == 0) | 84 | if ((val & BMCR_RESET) == 0) |
| 85 | break; | 85 | break; |