From afb803ec3bc2cfea90329ae7fd52005627e68063 Mon Sep 17 00:00:00 2001 From: Steve Glendinning Date: Fri, 28 Sep 2012 00:07:07 +0000 Subject: [PATCH] --- yaml --- r: 328124 b: refs/heads/master c: cf2acec2e90beffc20c8a63322f0a978ea4941df h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/smsc95xx.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d1f690d183ed..b1b0b8e13942 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a06e5e1bb217be077e1f8ee2745b4c5b1aa02db +refs/heads/master: cf2acec2e90beffc20c8a63322f0a978ea4941df diff --git a/trunk/drivers/net/usb/smsc95xx.c b/trunk/drivers/net/usb/smsc95xx.c index d45e539a84b7..ed1e551ff23b 100644 --- a/trunk/drivers/net/usb/smsc95xx.c +++ b/trunk/drivers/net/usb/smsc95xx.c @@ -763,12 +763,12 @@ static int smsc95xx_reset(struct usbnet *dev) timeout = 0; do { + msleep(10); ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf); if (ret < 0) { netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret); return ret; } - msleep(10); timeout++; } while ((read_buf & HW_CFG_LRST_) && (timeout < 100)); @@ -786,12 +786,12 @@ static int smsc95xx_reset(struct usbnet *dev) timeout = 0; do { + msleep(10); ret = smsc95xx_read_reg(dev, PM_CTRL, &read_buf); if (ret < 0) { netdev_warn(dev->net, "Failed to read PM_CTRL: %d\n", ret); return ret; } - msleep(10); timeout++; } while ((read_buf & PM_CTL_PHY_RST_) && (timeout < 100));