netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Steve Glendinning <steve.glendinning@shawell.net>
To: netdev@vger.kernel.org
Cc: Steve Glendinning <steve.glendinning@shawell.net>
Subject: [PATCH 1/5] smsc95xx: sleep before read for lengthy operations
Date: Mon, 24 Sep 2012 15:40:50 +0100	[thread overview]
Message-ID: <1348497654-9915-2-git-send-email-steve.glendinning@shawell.net> (raw)
In-Reply-To: <1348497654-9915-1-git-send-email-steve.glendinning@shawell.net>

During init, the device reset is unexpected to complete immediately,
so sleep before testing the condition rather than after it.

Signed-off-by: Steve Glendinning <steve.glendinning@shawell.net>
---
 drivers/net/usb/smsc95xx.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index d45e539..ed1e551 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/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));
 
-- 
1.7.9.5

  reply	other threads:[~2012-09-24 14:50 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-24 14:40 [PATCH 0/5] smsc95xx enhancements Steve Glendinning
2012-09-24 14:40 ` Steve Glendinning [this message]
2012-09-24 14:40 ` [PATCH 2/5] smsc95xx: remove unnecessary variables Steve Glendinning
2012-09-24 14:40 ` [PATCH 3/5] smsc95xx: check return code from control messages Steve Glendinning
2012-09-24 14:40 ` [PATCH 4/5] smsc95xx: fix resume when usb device is reset Steve Glendinning
2012-09-24 14:40 ` [PATCH 5/5] smsc95xx: enable power saving mode during system suspend Steve Glendinning
2012-09-26 12:25   ` Steve Glendinning
2012-09-27 23:17 ` [PATCH 0/5] smsc95xx enhancements David Miller
2012-09-28  8:42   ` Steve Glendinning
  -- strict thread matches above, loose matches on Subject: below --
2012-09-26 12:40 [PATCH 0/5] smsc95xx enhancements (v2) Steve Glendinning
2012-09-26 12:40 ` [PATCH 1/5] smsc95xx: sleep before read for lengthy operations Steve Glendinning

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1348497654-9915-2-git-send-email-steve.glendinning@shawell.net \
    --to=steve.glendinning@shawell.net \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).