diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-02-09 10:34:45 -0500 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-02-09 10:34:45 -0500 |
| commit | d41d4113f49e16bfab02eff0248282200be21807 (patch) | |
| tree | ae84803c22a09f138023ef62de73712f324bc62d /drivers/net/ibm_newemac/phy.c | |
| parent | b58a4cc51f4f569c6a86979890f9b237a504ab6b (diff) | |
| parent | d5b562330ec766292a3ac54ae5e0673610bd5b3d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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; |