From 692b1796e390ed4bc46e856142f84c6b88e912e8 Mon Sep 17 00:00:00 2001 From: Steve Glendinning Date: Mon, 30 Apr 2012 07:56:53 +0000 Subject: [PATCH] --- yaml --- r: 299967 b: refs/heads/master c: 8a1d59d79fffdad4bb1b3b5d069da4c6c52db2e6 h: refs/heads/master i: 299965: 8eb2c7393f97cac49597d3f518c5bd5ebd68296a 299963: 4942881c445900a643d69d66259fdc0fee10d92a 299959: 19d51789f6fb42e9b16b26dbcfc0c2e028a519c7 299951: c899409b5cb8fe06141f002878114a735a223f48 299935: 061ec068685c77efa8e099e5e3d0db9d9f041628 299903: 908d2c30f17fde642dd672c2bcce31baf9d1d0f0 v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/smsc75xx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fb7de0513902..c84392e52d9f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f49add9ad297dab392c14dc60d490364080739b +refs/heads/master: 8a1d59d79fffdad4bb1b3b5d069da4c6c52db2e6 diff --git a/trunk/drivers/net/usb/smsc75xx.c b/trunk/drivers/net/usb/smsc75xx.c index 1de778527813..cc23a589e40f 100644 --- a/trunk/drivers/net/usb/smsc75xx.c +++ b/trunk/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");