diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-05 08:33:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 08:33:31 -0500 |
| commit | 43769f10b4826376cbf4ce17af74a5b4e8dc4fcd (patch) | |
| tree | 8a7f36985f9ef8e6771163c751eeefd22ee71693 /drivers/net/ibm_newemac/phy.c | |
| parent | ae7462b4f1fe1f36b5d562dbd5202a2eba01f072 (diff) | |
| parent | eda58a85ec3fc05855a26654d97a2b53f0e715b9 (diff) | |
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
Diffstat (limited to 'drivers/net/ibm_newemac/phy.c')
| -rw-r--r-- | drivers/net/ibm_newemac/phy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ibm_newemac/phy.c b/drivers/net/ibm_newemac/phy.c index c40cd8df2212..ac9d964e59ec 100644 --- a/drivers/net/ibm_newemac/phy.c +++ b/drivers/net/ibm_newemac/phy.c | |||
| @@ -60,7 +60,7 @@ int emac_mii_reset_phy(struct mii_phy *phy) | |||
| 60 | 60 | ||
| 61 | udelay(300); | 61 | udelay(300); |
| 62 | 62 | ||
| 63 | while (limit--) { | 63 | while (--limit) { |
| 64 | val = phy_read(phy, MII_BMCR); | 64 | val = phy_read(phy, MII_BMCR); |
| 65 | if (val >= 0 && (val & BMCR_RESET) == 0) | 65 | if (val >= 0 && (val & BMCR_RESET) == 0) |
| 66 | break; | 66 | break; |
| @@ -84,7 +84,7 @@ int emac_mii_reset_gpcs(struct mii_phy *phy) | |||
| 84 | 84 | ||
| 85 | udelay(300); | 85 | udelay(300); |
| 86 | 86 | ||
| 87 | while (limit--) { | 87 | while (--limit) { |
| 88 | val = gpcs_phy_read(phy, MII_BMCR); | 88 | val = gpcs_phy_read(phy, MII_BMCR); |
| 89 | if (val >= 0 && (val & BMCR_RESET) == 0) | 89 | if (val >= 0 && (val & BMCR_RESET) == 0) |
| 90 | break; | 90 | break; |