From patchwork Tue Jun 25 06:39:44 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: 18097 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f70.google.com (mail-vb0-f70.google.com [209.85.212.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 05DB025D00 for ; Tue, 25 Jun 2013 06:40:59 +0000 (UTC) Received: by mail-vb0-f70.google.com with SMTP id q12sf16206798vbe.1 for ; Mon, 24 Jun 2013 23:40:58 -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=6afHxrQrrgtBPNiPMQonIKF3x2kVDhdNoS87qo9YLZ4=; b=lmbeI03dBnp5dxs7SUzhckoJn0ObowE4g//7WrQCDu5EY+tToiSOdETolYwg3mdlxs xr2QsCiw0rfKw90ErZ1ertfgV6pFeD0+9bwtyq9QhGuq+n6YxN6IDpS93/hxJoEmv72k 9kZba9wiE6g1hMIKxsbiYfhSV1VtkyXPc7+NaqaJtyUN6KKpJITx04gvwcDL1wxNPCBo v0XSmYN50J+m7tGl2TT83J0tZzpSSb/7hvmvYPRTDg1DhWlO0aZNR8V0DUErezv3YOXm TD8FoyTHaSrSc20DPwyD3S6s3i8D9hvRTPyERYOV531mr768MbR9V/50lgHPT+FdWRNr ffLQ== X-Received: by 10.236.223.162 with SMTP id v32mr15522238yhp.25.1372142458847; Mon, 24 Jun 2013 23:40:58 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.120.234 with SMTP id lf10ls1149650qeb.49.gmail; Mon, 24 Jun 2013 23:40:58 -0700 (PDT) X-Received: by 10.220.192.138 with SMTP id dq10mr13056091vcb.23.1372142458663; Mon, 24 Jun 2013 23:40:58 -0700 (PDT) Received: from mail-vb0-x22f.google.com (mail-vb0-x22f.google.com [2607:f8b0:400c:c02::22f]) by mx.google.com with ESMTPS id b5si5866822vcl.145.2013.06.24.23.40.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 24 Jun 2013 23:40:58 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::22f 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::22f; Received: by mail-vb0-f47.google.com with SMTP id x14so8894218vbb.6 for ; Mon, 24 Jun 2013 23:40:58 -0700 (PDT) X-Received: by 10.52.95.113 with SMTP id dj17mr11344283vdb.82.1372142458573; Mon, 24 Jun 2013 23:40:58 -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.165.8 with SMTP id yu8csp55576veb; Mon, 24 Jun 2013 23:40:57 -0700 (PDT) X-Received: by 10.68.28.232 with SMTP id e8mr26591110pbh.94.1372142457462; Mon, 24 Jun 2013 23:40:57 -0700 (PDT) Received: from mail-pa0-x236.google.com (mail-pa0-x236.google.com [2607:f8b0:400e:c03::236]) by mx.google.com with ESMTPS id zo4si10597629pbc.259.2013.06.24.23.40.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 24 Jun 2013 23:40:57 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400e:c03::236 is neither permitted nor denied by best guess record for domain of manjunath.goudar@linaro.org) client-ip=2607:f8b0:400e:c03::236; Received: by mail-pa0-f54.google.com with SMTP id kx10so12103337pab.41 for ; Mon, 24 Jun 2013 23:40:57 -0700 (PDT) X-Received: by 10.68.35.131 with SMTP id h3mr26948540pbj.140.1372142457025; Mon, 24 Jun 2013 23:40:57 -0700 (PDT) Received: from manjunath-Latitude-E6420.LGE.NET ([203.247.149.152]) by mx.google.com with ESMTPSA id mr3sm6037160pbb.27.2013.06.24.23.40.51 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 24 Jun 2013 23:40:56 -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-kernel@lists.linaro.org, Arnd Bergmann , Greg KH Subject: [PATCH V4 09/11] USB: OHCI: Properly handle ohci-pxa27x suspend Date: Tue, 25 Jun 2013 12:09:44 +0530 Message-Id: <1372142386-10691-10-git-send-email-manjunath.goudar@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1372142386-10691-1-git-send-email-manjunath.goudar@linaro.org> References: <1371050918-29472-1-git-send-email-manjunath.goudar@linaro.org> <1372142386-10691-1-git-send-email-manjunath.goudar@linaro.org> X-Gm-Message-State: ALoCoQkm/6gEchfnslRkPNf7A06yBLX/3x0I68ZmywRstcj7pvJu2L8GeDTXXgXeTwgCeO9yvY7v X-Original-Sender: manjunath.goudar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::22f 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-pxa27x glue was not properly handled as it was not suspending generic part of ohci controller. Calling explicitly the ohci_suspend() routine in ohci_hcd_pxa27x_drv_suspend() will ensure proper handling of suspend scenario. Signed-off-by: Manjunath Goudar Acked-by: Alan Stern Cc: Arnd Bergmann Cc: Greg KH Cc: linux-usb@vger.kernel.org V2: -Incase ohci_suspend() fails, return right away without executing further. V3: -Aligned variable "do_wakeup" and "ret". V4: -The do_wakeup and ret variable alignment is removed. --- drivers/usb/host/ohci-pxa27x.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index 3a9c01d..5fb91f1 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c @@ -564,13 +564,19 @@ static int ohci_hcd_pxa27x_drv_suspend(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct pxa27x_ohci *ohci = to_pxa27x_ohci(hcd); + bool do_wakeup = device_may_wakeup(dev); + int ret; if (time_before(jiffies, ohci->ohci.next_statechange)) msleep(5); ohci->ohci.next_statechange = jiffies; + ret = ohci_suspend(hcd, do_wakeup); + if (ret) + return ret; + pxa27x_stop_hc(ohci, dev); - return 0; + return ret; } static int ohci_hcd_pxa27x_drv_resume(struct device *dev)