From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ming Lei Subject: [PATCH 6/7] usbnet: smsc75xx: don't recover device if suspend fails in system sleep Date: Tue, 5 Mar 2013 12:01:42 +0800 Message-ID: <1362456103-24956-7-git-send-email-ming.lei@canonical.com> References: <1362456103-24956-1-git-send-email-ming.lei@canonical.com> Cc: Alan Stern , Oliver Neukum , netdev@vger.kernel.org, linux-usb@vger.kernel.org, linux-input@vger.kernel.org, Ming Lei , Steve Glendinning To: "David S. Miller" , Greg Kroah-Hartman , Jiri Kosina Return-path: In-Reply-To: <1362456103-24956-1-git-send-email-ming.lei@canonical.com> Sender: linux-input-owner@vger.kernel.org List-Id: netdev.vger.kernel.org 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 Signed-off-by: Ming Lei --- 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..f65c506 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(msg)) usbnet_resume(intf); return ret; } -- 1.7.9.5