From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ming Lei Subject: [PATCH v1 4/7] usbnet: cdc_mbim: don't recover device if suspend fails in system sleep Date: Wed, 6 Mar 2013 18:25:53 +0800 Message-ID: <1362565557-15884-5-git-send-email-ming.lei@canonical.com> References: <1362565557-15884-1-git-send-email-ming.lei@canonical.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mail-pb0-f52.google.com ([209.85.160.52]:54950 "EHLO mail-pb0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752942Ab3CFK0w (ORCPT ); Wed, 6 Mar 2013 05:26:52 -0500 In-Reply-To: <1362565557-15884-1-git-send-email-ming.lei@canonical.com> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: "David S. Miller" , Greg Kroah-Hartman , Jiri Kosina Cc: Alan Stern , Oliver Neukum , netdev@vger.kernel.org, linux-usb@vger.kernel.org, linux-input@vger.kernel.org, Ming Lei , =?UTF-8?q?Bj=C3=B8rn=20Mork?= 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=C3=B8rn Mork Signed-off-by: Ming Lei --- 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..ec58c2c 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 *i= ntf, pm_message_t message) =20 if (intf =3D=3D ctx->control && info->subdriver && info->subdriver->s= uspend) ret =3D info->subdriver->suspend(intf, message); - if (ret < 0) + if (ret < 0 && PMSG_IS_AUTO(message)) usbnet_resume(intf); =20 error: --=20 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-input" = in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html