diff options
author | Eric Miao <eric.miao@marvell.com> | 2009-03-09 16:21:07 +0300 |
---|---|---|
committer | Eric Miao <eric.miao@marvell.com> | 2009-03-09 16:21:07 +0300 |
commit | abcea2c322cef559ef2f108b4763d107a5ccc37f (patch) | |
tree | 5fec7fec372f9bdb70703f6c77bfc49cda945442 /drivers/net/ibm_newemac/phy.c | |
parent | 8118aea23c328fd4913b325af53fda9d530b1d56 (diff) | |
parent | 6d831c6554e4f95083919914955a1a3a4a6acfa9 (diff) | |
download | linux-abcea2c322cef559ef2f108b4763d107a5ccc37f.tar.xz |
Merge branch 'devel' of ssh://master.kernel.org/home/rmk/linux-2.6-arm into devel
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) udelay(300); - while (limit--) { + while (--limit) { val = phy_read(phy, MII_BMCR); if (val >= 0 && (val & BMCR_RESET) == 0) break; @@ -84,7 +84,7 @@ int emac_mii_reset_gpcs(struct mii_phy *phy) udelay(300); - while (limit--) { + while (--limit) { val = gpcs_phy_read(phy, MII_BMCR); if (val >= 0 && (val & BMCR_RESET) == 0) break; |