aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRabin Vincent <rabin@rab.in>2011-04-30 08:29:27 +0000
committerNicolas Pitre <nicolas.pitre@linaro.org>2011-05-16 13:27:14 -0400
commit11d9d0e35ad08fe4d2a59f0ab931ca147649a4eb (patch)
tree5410b323444e38fc1bce174f27da2d9ca38a482a /drivers
parent0a1f094ea7bfb405b96f53e5a6c55759e29e0987 (diff)
downloadlinux-linaro-android-11d9d0e35ad08fe4d2a59f0ab931ca147649a4eb.tar.gz
smsc95xx: fix reset check
The reset loop check should check the MII_BMCR register value for BMCR_RESET rather than for MII_BMCR (the register address, which also happens to be zero). Signed-off-by: Rabin Vincent <rabin@rab.in> Signed-off-by: David S. Miller <davem@davemloft.net> (cherry picked from commit d946092000698fd204d82a9d239103c656fb63bf)
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/usb/smsc95xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 727874d9deb..6e8b698e00c 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -730,7 +730,7 @@ static int smsc95xx_phy_initialize(struct usbnet *dev)
msleep(10);
bmcr = smsc95xx_mdio_read(dev->net, dev->mii.phy_id, 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");