From patchwork Wed Apr 9 04:00:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Gautam X-Patchwork-Id: 3952371 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EA0FEBFF02 for ; Wed, 9 Apr 2014 04:01:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 16F2820600 for ; Wed, 9 Apr 2014 04:01:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 08647205FC for ; Wed, 9 Apr 2014 04:01:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750724AbaDIEBA (ORCPT ); Wed, 9 Apr 2014 00:01:00 -0400 Received: from mail-pb0-f41.google.com ([209.85.160.41]:34637 "EHLO mail-pb0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750706AbaDIEA6 (ORCPT ); Wed, 9 Apr 2014 00:00:58 -0400 Received: by mail-pb0-f41.google.com with SMTP id jt11so1944345pbb.14 for ; Tue, 08 Apr 2014 21:00:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=xWShO/X/BlOVFsDwyFlh0MZWKKMzbQC4EKQsHX7wqME=; b=rQGvvop3mymMdcd4RTY+zSwtLYN3Ss2MIh6iG3qkd0Q/JdZSXLxVCXE0i3RMf2vUGb +y4dBFe7Zs7Gg9sPjY8Q3/VkvorTTByyuyoNfWFquC1yFFIB+eBtRlEVFp2iPKbKuqup bb10+CCtQYdM4Q9doK21I3uS2V34LziV5vqGPl6FjKryO9FWOiBNwug/FQTwaoExU1Nx YTVTliZ/WmZP0A0rUpbtEvmEYWl/VJ4wLlx1DESTfqII7brL0ShBo8Q3iDjn+hqvNa1s rMN7DMvCd+XqIv/n9bE8a29HiEsit2mzxu4uH9v5gBBayd6b3Hn5nJT7Ecyq1x/04T2V SX9Q== X-Received: by 10.68.244.229 with SMTP id xj5mr9178318pbc.108.1397016057817; Tue, 08 Apr 2014 21:00:57 -0700 (PDT) Received: from vivek-linuxpc.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id wp3sm8062329pbc.67.2014.04.08.21.00.54 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 08 Apr 2014 21:00:57 -0700 (PDT) From: Vivek Gautam To: linux-usb@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: gregkh@linuxfoundation.org, kgene.kim@samsung.com, Alan Stern , Jingoo Han Subject: [PATCH 1/2] usb: ehci-exynos: Return immediately from suspend if ehci_suspend fails Date: Wed, 9 Apr 2014 09:30:41 +0530 Message-Id: <1397016042-4451-1-git-send-email-gautam.vivek@samsung.com> X-Mailer: git-send-email 1.7.10.4 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Patch 'b8efdaf USB: EHCI: add check for wakeup/suspend race' adds a check for possible race between suspend and wakeup interrupt, and thereby it returns -EBUSY as error code if there's a wakeup interrupt. So the platform host controller should not proceed further with its suspend callback, rather should return immediately to avoid powering down the essential things, like phy. Signed-off-by: Vivek Gautam Cc: Alan Stern Cc: Jingoo Han Acked-by: Jingoo Han --- Based on 'usb-next' branch of Greg's usb tree. drivers/usb/host/ehci-exynos.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c index d1d8c47..a4550eb 100644 --- a/drivers/usb/host/ehci-exynos.c +++ b/drivers/usb/host/ehci-exynos.c @@ -212,6 +212,8 @@ static int exynos_ehci_suspend(struct device *dev) int rc; rc = ehci_suspend(hcd, do_wakeup); + if (rc) + return rc; if (exynos_ehci->otg) exynos_ehci->otg->set_host(exynos_ehci->otg, &hcd->self); @@ -221,7 +223,7 @@ static int exynos_ehci_suspend(struct device *dev) clk_disable_unprepare(exynos_ehci->clk); - return rc; + return 0; } static int exynos_ehci_resume(struct device *dev)