From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753298AbbLDORo (ORCPT ); Fri, 4 Dec 2015 09:17:44 -0500 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:6687 "EHLO mx0a-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752590AbbLDORm (ORCPT ); Fri, 4 Dec 2015 09:17:42 -0500 Date: Fri, 4 Dec 2015 22:13:37 +0800 From: Jisheng Zhang To: , CC: , , Subject: Re: [PATCH 1/7] usb: xhci: plat: Fix suspend/resume when the optional clk exists Message-ID: <20151204221337.46ded0bd@xhacker> In-Reply-To: <1449238252-5630-2-git-send-email-jszhang@marvell.com> References: <1449238252-5630-1-git-send-email-jszhang@marvell.com> <1449238252-5630-2-git-send-email-jszhang@marvell.com> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2015-12-04_06:,, signatures=0 X-Proofpoint-Spam-Details: rule=inbound_notspam policy=inbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1507310000 definitions=main-1512040239 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org cc linux-usb@vger.kernel.org On Fri, 4 Dec 2015 22:10:46 +0800 Jisheng Zhang wrote: > Commit 4718c1774051 ("usb: host: xhci-plat: add clock support") adds > optional clk support, but it forgets to prepare/disable and > enable/unprepare the clk in the resume/suspend path. This path fixes > this issue by adding missing clk related calls. > > Signed-off-by: Jisheng Zhang > Fixes: 4718c1774051 ("usb: host: xhci-plat: add clock support") > --- > drivers/usb/host/xhci-plat.c | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c > index 05647e6..b566304 100644 > --- a/drivers/usb/host/xhci-plat.c > +++ b/drivers/usb/host/xhci-plat.c > @@ -226,6 +226,7 @@ static int xhci_plat_remove(struct platform_device *dev) > #ifdef CONFIG_PM_SLEEP > static int xhci_plat_suspend(struct device *dev) > { > + int ret; > struct usb_hcd *hcd = dev_get_drvdata(dev); > struct xhci_hcd *xhci = hcd_to_xhci(hcd); > > @@ -237,14 +238,25 @@ static int xhci_plat_suspend(struct device *dev) > * reconsider this when xhci_plat_suspend enlarges its scope, e.g., > * also applies to runtime suspend. > */ > - return xhci_suspend(xhci, device_may_wakeup(dev)); > + ret = xhci_suspend(xhci, device_may_wakeup(dev)); > + if (ret) > + return ret; > + > + clk_disable_unprepare(xhci->clk); > + > + return ret; > } > > static int xhci_plat_resume(struct device *dev) > { > + int ret; > struct usb_hcd *hcd = dev_get_drvdata(dev); > struct xhci_hcd *xhci = hcd_to_xhci(hcd); > > + ret = clk_prepare_enable(xhci->clk); > + if (ret) > + return ret; > + > return xhci_resume(xhci, 0); > } >