From patchwork Thu Mar 7 16:15:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 225881 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A25EB2C0356 for ; Fri, 8 Mar 2013 03:17:07 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759471Ab3CGQRD (ORCPT ); Thu, 7 Mar 2013 11:17:03 -0500 Received: from mail-pb0-f43.google.com ([209.85.160.43]:63841 "EHLO mail-pb0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759443Ab3CGQRA (ORCPT ); Thu, 7 Mar 2013 11:17:00 -0500 Received: by mail-pb0-f43.google.com with SMTP id md12so480690pbc.30 for ; Thu, 07 Mar 2013 08:17:00 -0800 (PST) X-Received: by 10.66.170.42 with SMTP id aj10mr3757627pac.88.1362673020317; Thu, 07 Mar 2013 08:17:00 -0800 (PST) Received: from localhost ([183.37.214.52]) by mx.google.com with ESMTPS id in5sm2162352pbc.20.2013.03.07.08.16.53 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 07 Mar 2013 08:16:59 -0800 (PST) From: Ming Lei 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 , Steve Glendinning Subject: [PATCH v2 7/7] usbnet: smsc75xx: don't recover device if suspend fails in system sleep Date: Fri, 8 Mar 2013 00:15:24 +0800 Message-Id: <1362672924-22975-8-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1362672924-22975-1-git-send-email-ming.lei@canonical.com> References: <1362672924-22975-1-git-send-email-ming.lei@canonical.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: 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. Also add comments on this case. Cc: Steve Glendinning Signed-off-by: Ming Lei --- drivers/net/usb/smsc75xx.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c index 9abe517..21b607a 100644 --- a/drivers/net/usb/smsc75xx.c +++ b/drivers/net/usb/smsc75xx.c @@ -2011,7 +2011,11 @@ static int smsc75xx_suspend(struct usb_interface *intf, pm_message_t message) ret = smsc75xx_enter_suspend0(dev); done: - if (ret) + /* + * TODO: resume() might need to handle the suspend failure + * in system sleep + */ + if (ret && PMSG_IS_AUTO(message)) usbnet_resume(intf); return ret; }