From patchwork Wed Mar 6 10:25:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 225471 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 3088C2C0388 for ; Wed, 6 Mar 2013 21:27:29 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757037Ab3CFK1Z (ORCPT ); Wed, 6 Mar 2013 05:27:25 -0500 Received: from mail-pb0-f44.google.com ([209.85.160.44]:58211 "EHLO mail-pb0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756993Ab3CFK1X (ORCPT ); Wed, 6 Mar 2013 05:27:23 -0500 Received: by mail-pb0-f44.google.com with SMTP id wz12so5822910pbc.17 for ; Wed, 06 Mar 2013 02:27:22 -0800 (PST) X-Received: by 10.68.224.1 with SMTP id qy1mr46182909pbc.169.1362565642397; Wed, 06 Mar 2013 02:27:22 -0800 (PST) Received: from localhost ([183.37.194.87]) by mx.google.com with ESMTPS id iv3sm30686982pbc.40.2013.03.06.02.27.16 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 06 Mar 2013 02:27:21 -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 , =?UTF-8?q?Bj=C3=B8rn=20Mork?= Subject: [PATCH v1 7/7] usbnet: qmi_wwan: don't recover device if suspend fails in system sleep Date: Wed, 6 Mar 2013 18:25:56 +0800 Message-Id: <1362565557-15884-8-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1362565557-15884-1-git-send-email-ming.lei@canonical.com> References: <1362565557-15884-1-git-send-email-ming.lei@canonical.com> MIME-Version: 1.0 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. Cc: Bjørn Mork Signed-off-by: Ming Lei --- drivers/net/usb/qmi_wwan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c index efb5c7c..1b4367c 100644 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c @@ -294,7 +294,7 @@ static int qmi_wwan_suspend(struct usb_interface *intf, pm_message_t message) if (intf == info->control && info->subdriver && info->subdriver->suspend) ret = info->subdriver->suspend(intf, message); - if (ret < 0) + if (ret < 0 && PMSG_IS_AUTO(message)) usbnet_resume(intf); err: return ret;