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>,
"Bjørn Mork" <bjorn@mork.no>
Subject: [PATCH 4/7] usbnet: cdc_mbim: don't recover device if suspend fails in system sleep
Date: Tue, 5 Mar 2013 12:01:40 +0800 [thread overview]
Message-ID: <1362456103-24956-5-git-send-email-ming.lei@canonical.com> (raw)
In-Reply-To: <1362456103-24956-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: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Ming Lei <ming.lei@canonical.com>
---
drivers/net/usb/cdc_mbim.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c
index 248d2dc..da83546 100644
--- a/drivers/net/usb/cdc_mbim.c
+++ b/drivers/net/usb/cdc_mbim.c
@@ -338,7 +338,7 @@ static int cdc_mbim_suspend(struct usb_interface *intf, pm_message_t message)
if (intf == ctx->control && info->subdriver && info->subdriver->suspend)
ret = info->subdriver->suspend(intf, message);
- if (ret < 0)
+ if (ret < 0 && PMSG_IS_AUTO(msg))
usbnet_resume(intf);
error:
--
1.7.9.5
next prev parent reply other threads:[~2013-03-05 4:01 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-05 4:01 [PATCH 0/7] USB: don't recover device if suspend fails in system sleep Ming Lei
2013-03-05 4:01 ` [PATCH 1/7] USB: adds comment on suspend callback Ming Lei
2013-03-05 13:16 ` Ming Lei
[not found] ` <1362456103-24956-1-git-send-email-ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
2013-03-05 4:01 ` [PATCH 2/7] USB: serial: handle suspend failure path correctly Ming Lei
2013-03-05 4:01 ` [PATCH 3/7] USBHID: don't recover device if suspend fails in system sleep Ming Lei
2013-03-05 4:01 ` Ming Lei [this message]
[not found] ` <1362456103-24956-5-git-send-email-ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
2013-03-05 7:09 ` [PATCH 4/7] usbnet: cdc_mbim: " Bjørn Mork
2013-03-05 11:07 ` Ming Lei
2013-03-05 13:46 ` Bjørn Mork
2013-03-05 14:50 ` Ming Lei
2013-03-05 15:03 ` Bjørn Mork
2013-03-05 15:29 ` Ming Lei
2013-03-05 16:08 ` Bjørn Mork
[not found] ` <87wqtlommw.fsf-lbf33ChDnrE/G1V5fR+Y7Q@public.gmane.org>
2013-03-05 16:54 ` Alan Stern
2013-03-05 17:35 ` Bjørn Mork
2013-03-06 2:51 ` Ming Lei
2013-03-06 3:03 ` Ming Lei
[not found] ` <CACVXFVN=i10cVS3RQ7jGrJAfsC+r2t61z7XOVKWMAMqKKELZCg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-03-06 7:06 ` Bjørn Mork
2013-03-06 7:50 ` Ming Lei
2013-03-06 8:32 ` Bjørn Mork
2013-03-05 4:01 ` [PATCH 5/7] usbnet: smsc95xx: " Ming Lei
2013-03-05 4:01 ` [PATCH 6/7] usbnet: smsc75xx: " Ming Lei
2013-03-05 4:01 ` [PATCH 7/7] usbnet: qmi_wwan: " Ming Lei
[not found] ` <1362456103-24956-8-git-send-email-ming.lei-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
2013-03-05 7:09 ` Bjørn Mork
2013-03-05 12:27 ` Ming Lei
2013-03-05 5:14 ` [PATCH 0/7] USB: " Ming Lei
2013-03-05 7:03 ` Bjørn Mork
2013-03-05 10:55 ` Ming Lei
2013-03-05 12:50 ` Oliver Neukum
[not found] ` <3703451.5FViJ58GpZ-7ztolUikljGernLeA6q8OA@public.gmane.org>
2013-03-05 13:08 ` Ming Lei
2013-03-05 13:28 ` Oliver Neukum
2013-03-05 14:03 ` Ming Lei
2013-03-05 13:18 ` Bjørn Mork
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=1362456103-24956-5-git-send-email-ming.lei@canonical.com \
--to=ming.lei@canonical.com \
--cc=bjorn@mork.no \
--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 \
/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).