summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorSteve Glendinning <steve.glendinning@shawell.net>2012-04-30 09:56:53 +0200
committerDavid S. Miller <davem@davemloft.net>2012-05-01 03:52:40 +0200
commit8a1d59d79fffdad4bb1b3b5d069da4c6c52db2e6 (patch)
tree1738d6b12e58761eb5d559bdfe24d7fbcb33c2a1 /drivers/net
parentsmsc75xx: add more information to register io failure warnings (diff)
downloadlinux-8a1d59d79fffdad4bb1b3b5d069da4c6c52db2e6.tar.xz
linux-8a1d59d79fffdad4bb1b3b5d069da4c6c52db2e6.zip
smsc75xx: fix phy init reset loop
fix bug in phy_init loop that was ignoring BMCR reset bit, akin to smsc95xx's d946092000698fd204d82a9d239103c656fb63bf Signed-off-by: Stephane Fillod <fillods@users.sf.net> Signed-off-by: Steve Glendinning <steve.glendinning@shawell.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/usb/smsc75xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index 1de778527813..cc23a589e40f 100644
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -661,7 +661,7 @@ static int smsc75xx_phy_initialize(struct usbnet *dev)
bmcr = smsc75xx_mdio_read(dev->net, dev->mii.phy_id, MII_BMCR);
check_warn_return(bmcr, "Error reading MII_BMCR");
timeout++;
- } while ((bmcr & MII_BMCR) && (timeout < 100));
+ } while ((bmcr & BMCR_RESET) && (timeout < 100));
if (timeout >= 100) {
netdev_warn(dev->net, "timeout on PHY Reset");