From patchwork Thu Jun 13 09:16:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: manjunath.goudar@linaro.org X-Patchwork-Id: 17881 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f72.google.com (mail-qa0-f72.google.com [209.85.216.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B376D25BE0 for ; Thu, 13 Jun 2013 09:17:03 +0000 (UTC) Received: by mail-qa0-f72.google.com with SMTP id f14sf1712996qak.3 for ; Thu, 13 Jun 2013 02:17:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=PFXLM+QKqoW98akyhWykQL7zdatr1AL65zws8YiwadM=; b=gHUamEdGuYbK1IR7Qdn8RAfGovkf4kc/lU21SMSHU+s1Tg03n2+yUlqxCH9va3mN7j TJR9YKF5HfDiLcRaxRYKs54Bd6bal0vUsnzLcjyWdFU57ES9gd6YZ/vvB3vj6QTgP7Ny BN124JBxS5+iCa4VuGyKV/NhshzY/ZAzgNJnkILdx3Yxpe/X1RHceZCKr1Gm6mP7cgJf n27As9skqAmAJUQiT6HPm2Tni5WpHyvRIxG8tX6zwHQIRkNEOnh6eanaT1j58aT3Yxmr 3O+yi2bynNsDdrxGNr5+XJA1qpX+0UrUEIchVEnWWWM9SBnO4Bnv5yjqTUmjjmKtNdQ+ qnWA== X-Received: by 10.224.215.68 with SMTP id hd4mr1161905qab.5.1371115023528; Thu, 13 Jun 2013 02:17:03 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.118.198 with SMTP id ko6ls3788562qeb.61.gmail; Thu, 13 Jun 2013 02:17:03 -0700 (PDT) X-Received: by 10.220.83.138 with SMTP id f10mr7564vcl.7.1371115023322; Thu, 13 Jun 2013 02:17:03 -0700 (PDT) Received: from mail-vb0-x22c.google.com (mail-vb0-x22c.google.com [2607:f8b0:400c:c02::22c]) by mx.google.com with ESMTPS id s7si8097883vcr.24.2013.06.13.02.17.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Jun 2013 02:17:03 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::22c is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::22c; Received: by mail-vb0-f44.google.com with SMTP id e15so3152343vbg.17 for ; Thu, 13 Jun 2013 02:17:03 -0700 (PDT) X-Received: by 10.52.155.67 with SMTP id vu3mr9533657vdb.94.1371115023201; Thu, 13 Jun 2013 02:17:03 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.191.99 with SMTP id gx3csp13735vec; Thu, 13 Jun 2013 02:17:02 -0700 (PDT) X-Received: by 10.66.139.8 with SMTP id qu8mr1911503pab.132.1371115022144; Thu, 13 Jun 2013 02:17:02 -0700 (PDT) Received: from mail-pa0-x22b.google.com (mail-pa0-x22b.google.com [2607:f8b0:400e:c03::22b]) by mx.google.com with ESMTPS id tw4si8381429pbc.121.2013.06.13.02.17.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Jun 2013 02:17:02 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400e:c03::22b is neither permitted nor denied by best guess record for domain of manjunath.goudar@linaro.org) client-ip=2607:f8b0:400e:c03::22b; Received: by mail-pa0-f43.google.com with SMTP id hz11so7039109pad.16 for ; Thu, 13 Jun 2013 02:17:01 -0700 (PDT) X-Received: by 10.68.189.36 with SMTP id gf4mr24004935pbc.73.1371115021639; Thu, 13 Jun 2013 02:17:01 -0700 (PDT) Received: from manjunath-Latitude-E6420.LGE.NET ([203.247.149.152]) by mx.google.com with ESMTPSA id dc3sm22602113pbc.9.2013.06.13.02.16.56 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Jun 2013 02:17:01 -0700 (PDT) From: Manjunath Goudar To: linux-usb@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, patches@linaro.org, stern@rowland.harvard.edu, arnd@linaro.org, manjunath.goudar@linaro.org, linaro-dev@lists.linaro.org, Arnd Bergmann , Greg KH Subject: [PATCH V2 04/10] USB: OHCI: Properly handle ohci-ep93xx suspend Date: Thu, 13 Jun 2013 14:46:23 +0530 Message-Id: <1371114989-2342-5-git-send-email-manjunath.goudar@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1371114989-2342-1-git-send-email-manjunath.goudar@linaro.org> References: <1371050918-29472-1-git-send-email-manjunath.goudar@linaro.org> <1371114989-2342-1-git-send-email-manjunath.goudar@linaro.org> X-Gm-Message-State: ALoCoQkZuvvsFUcrSy36E3HoOeJ9jhNCDE0mHG80JBPoh+N94Z10l/8fwxqwdO2ArzneRouDnCkP X-Original-Sender: manjunath.goudar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::22c is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Suspend scenario in case of ohci-ep93xx glue was not properly handled as it was not suspending generic part of ohci controller.Calling explicitly the ohci_suspend() routine in ohci_hcd_ep93xx_drv_suspend() will ensure proper handling of suspend scenario. V2: -Incase ohci_suspend() fails, return right away without executing further. Signed-off-by: Manjunath Goudar Cc: Arnd Bergmann Cc: Alan Stern Cc: Greg KH Cc: linux-usb@vger.kernel.org --- drivers/usb/host/ohci-ep93xx.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c index 8704e9f..b36b74e 100644 --- a/drivers/usb/host/ohci-ep93xx.c +++ b/drivers/usb/host/ohci-ep93xx.c @@ -174,13 +174,23 @@ static int ohci_hcd_ep93xx_drv_suspend(struct platform_device *pdev, pm_message_ { struct usb_hcd *hcd = platform_get_drvdata(pdev); struct ohci_hcd *ohci = hcd_to_ohci(hcd); + bool do_wakeup = device_may_wakeup(&pdev->dev); + int ret; + + ret = ohci_suspend(hcd, do_wakeup); + if (ret == 0 && do_wakeup && HCD_WAKEUP_PENDING(hcd)) { + ohci_resume(hcd, false); + ret = -EBUSY; + } + if (ret) + return ret; if (time_before(jiffies, ohci->next_statechange)) msleep(5); ohci->next_statechange = jiffies; ep93xx_stop_hc(&pdev->dev); - return 0; + return ret; } static int ohci_hcd_ep93xx_drv_resume(struct platform_device *pdev)