From patchwork Thu Jun 13 09:11:00 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: 17876 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A80F525BE0 for ; Thu, 13 Jun 2013 09:12:02 +0000 (UTC) Received: by mail-qc0-f197.google.com with SMTP id u12sf6027444qcx.0 for ; Thu, 13 Jun 2013 02:12:02 -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=X0+ZHfp+ycCvWTIYvKOVh+7Uiwc0LF+LqiPiLtoKzj4=; b=YRtpfZTYN/5QuvWrBGr5RHyQtyNNNkD/cn2P7+bwss2e7PEuVFsMc8tMBVQCBGUnDX ITpRFkb/X1cBsYuTSHEr5BWsKu4EIN5bIw3UookW/IDjnrN5aikLzko2TzRwuRj0O/M9 r2Zc0E6IFuZWfXsLKRgb0S+kc2CwVwarXJhGYZJY22WvrtRN8jdimIidy6ZySgpn7JFM Q6GsjUXXW/Aw6gZDEgKsJ6ZFmg7exC7vEdzBLV8YJ3SpeE8eOOSo3v7Zj4oDbiqENlMM gE7wyeGjNbelOFu2Lx1WMOVGKDMRC96eLOOW81iuzKdS/KnLzWvs52q8UHlQdbEJAIcH 5+JA== X-Received: by 10.224.42.141 with SMTP id s13mr1160282qae.3.1371114722455; Thu, 13 Jun 2013 02:12:02 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.38.227 with SMTP id j3ls1731839qek.67.gmail; Thu, 13 Jun 2013 02:12:02 -0700 (PDT) X-Received: by 10.221.5.71 with SMTP id of7mr4894557vcb.39.1371114722283; Thu, 13 Jun 2013 02:12:02 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id ny2si5747639vcb.4.2013.06.13.02.12.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Jun 2013 02:12:02 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id ht10so3532255vcb.32 for ; Thu, 13 Jun 2013 02:12:02 -0700 (PDT) X-Received: by 10.220.144.67 with SMTP id y3mr276272vcu.17.1371114722160; Thu, 13 Jun 2013 02:12:02 -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 gx3csp13575vec; Thu, 13 Jun 2013 02:12:01 -0700 (PDT) X-Received: by 10.68.170.68 with SMTP id ak4mr23431573pbc.211.1371114720949; Thu, 13 Jun 2013 02:12:00 -0700 (PDT) Received: from mail-pb0-x22c.google.com (mail-pb0-x22c.google.com [2607:f8b0:400e:c01::22c]) by mx.google.com with ESMTPS id o4si13490964pac.47.2013.06.13.02.12.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Jun 2013 02:12:00 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400e:c01::22c is neither permitted nor denied by best guess record for domain of manjunath.goudar@linaro.org) client-ip=2607:f8b0:400e:c01::22c; Received: by mail-pb0-f44.google.com with SMTP id uo1so5407910pbc.3 for ; Thu, 13 Jun 2013 02:12:00 -0700 (PDT) X-Received: by 10.68.203.161 with SMTP id kr1mr23211054pbc.192.1371114720500; Thu, 13 Jun 2013 02:12:00 -0700 (PDT) Received: from manjunath-Latitude-E6420.LGE.NET ([203.247.149.152]) by mx.google.com with ESMTPSA id p2sm28451974pag.22.2013.06.13.02.11.56 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Jun 2013 02:11:59 -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 09/10] USB: OHCI: Properly handle ohci-sm501 suspend Date: Thu, 13 Jun 2013 14:41:00 +0530 Message-Id: <1371114661-2207-10-git-send-email-manjunath.goudar@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1371114661-2207-1-git-send-email-manjunath.goudar@linaro.org> References: <1371050918-29472-1-git-send-email-manjunath.goudar@linaro.org> <1371114661-2207-1-git-send-email-manjunath.goudar@linaro.org> X-Gm-Message-State: ALoCoQkZME170/hq0OGjYdce8UNYr1jktL4sVUPgUYv6rPzjeeDx32E5MaRu1PIbs7oMWejx6ChU X-Original-Sender: manjunath.goudar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.173 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-sm501 glue was not properly handled as it was not suspending generic part of ohci controller.Calling explicitly the ohci_suspend() routine in ohci_sm501_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-sm501.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c index d479d5d..81ebbce 100644 --- a/drivers/usb/host/ohci-sm501.c +++ b/drivers/usb/host/ohci-sm501.c @@ -216,14 +216,25 @@ static int ohci_hcd_sm501_drv_remove(struct platform_device *pdev) static int ohci_sm501_suspend(struct platform_device *pdev, pm_message_t msg) { struct device *dev = &pdev->dev; - struct ohci_hcd *ohci = hcd_to_ohci(platform_get_drvdata(pdev)); + struct usb_hcd *hcd = platform_get_drvdata(pdev); + struct ohci_hcd *ohci = hcd_to_ohci(hcd); + bool do_wakeup = device_may_wakeup(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; sm501_unit_power(dev->parent, SM501_GATE_USB_HOST, 0); - return 0; + return ret; } static int ohci_sm501_resume(struct platform_device *pdev)