linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ming Lei <ming.lei@canonical.com>
To: "David S. Miller" <davem@davemloft.net>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jiri Kosina <jkosina@suse.cz>
Cc: Alan Stern <stern@rowland.harvard.edu>,
	Oliver Neukum <oneukum@suse.de>,
	netdev@vger.kernel.org, linux-usb@vger.kernel.org,
	linux-input@vger.kernel.org, Ming Lei <ming.lei@canonical.com>,
	Steve Glendinning <steve.glendinning@shawell.net>
Subject: [PATCH v1 6/7] usbnet: smsc75xx: don't recover device if suspend fails in system sleep
Date: Wed,  6 Mar 2013 18:25:55 +0800	[thread overview]
Message-ID: <1362565557-15884-7-git-send-email-ming.lei@canonical.com> (raw)
In-Reply-To: <1362565557-15884-1-git-send-email-ming.lei@canonical.com>

If suspend callback fails in system sleep context, usb core will
ignore the failure and let system sleep go ahead further, so
this patch doesn't recover device under this situation.

Cc: Steve Glendinning <steve.glendinning@shawell.net>
Signed-off-by: Ming Lei <ming.lei@canonical.com>
---
 drivers/net/usb/smsc75xx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index 9abe517..997a694 100644
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -2011,7 +2011,7 @@ static int smsc75xx_suspend(struct usb_interface *intf, pm_message_t message)
 	ret = smsc75xx_enter_suspend0(dev);
 
 done:
-	if (ret)
+	if (ret && PMSG_IS_AUTO(message))
 		usbnet_resume(intf);
 	return ret;
 }
-- 
1.7.9.5

      parent reply	other threads:[~2013-03-06 10:25 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-06 10:25 [PATCH v1 0/7] USB: don't recover device if suspend fails in system sleep Ming Lei
     [not found] ` <1362565557-15884-1-git-send-email-ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
2013-03-06 10:25   ` [PATCH v1 1/7] USB: adds comment on suspend callback Ming Lei
2013-03-06 15:25     ` Alan Stern
2013-03-07  2:09       ` Ming Lei
2013-03-06 10:25   ` [PATCH v1 7/7] usbnet: qmi_wwan: don't recover device if suspend fails in system sleep Ming Lei
2013-03-06 12:07     ` Bjørn Mork
2013-03-06 10:25 ` [PATCH v1 2/7] USB: serial: handle suspend failure path correctly Ming Lei
2013-03-06 10:25 ` [PATCH v1 3/7] USBHID: don't recover device if suspend fails in system sleep Ming Lei
2013-03-06 10:25 ` [PATCH v1 4/7] usbnet: cdc_mbim: " Ming Lei
2013-03-06 12:04   ` Bjørn Mork
     [not found]     ` <877glkohu2.fsf-lbf33ChDnrE/G1V5fR+Y7Q@public.gmane.org>
2013-03-06 13:48       ` Ming Lei
2013-03-06 14:53         ` Bjørn Mork
2013-03-06 10:25 ` [PATCH v1 5/7] usbnet: smsc95xx: " Ming Lei
2013-03-06 10:25 ` Ming Lei [this message]

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=1362565557-15884-7-git-send-email-ming.lei@canonical.com \
    --to=ming.lei@canonical.com \
    --cc=davem@davemloft.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=jkosina@suse.cz \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=oneukum@suse.de \
    --cc=stern@rowland.harvard.edu \
    --cc=steve.glendinning@shawell.net \
    /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).