| Message ID | 1449238252-5630-2-git-send-email-jszhang@marvell.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 <jszhang@marvell.com> > 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); > } >
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); }
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 <jszhang@marvell.com> Fixes: 4718c1774051 ("usb: host: xhci-plat: add clock support") --- drivers/usb/host/xhci-plat.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)