From mboxrd@z Thu Jan 1 00:00:00 1970 From: jszhang@marvell.com (Jisheng Zhang) Date: Mon, 7 Dec 2015 20:49:20 +0800 Subject: [PATCH v2 3/7] usb: xhci: plat: Fix suspend/resume when the optional usb_phy exists In-Reply-To: <1449492564-4803-1-git-send-email-jszhang@marvell.com> References: <1449492564-4803-1-git-send-email-jszhang@marvell.com> Message-ID: <1449492564-4803-4-git-send-email-jszhang@marvell.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Commit 7b8ef22ea547 ("usb: xhci: plat: Add USB phy support") adds the usb_phy for usb3, but it forgets to shutdown/init the usb_phy in the suspend/resume path. This patch fixes this issue by adding missing usb_phy related calls. Signed-off-by: Jisheng Zhang --- drivers/usb/host/xhci-plat.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index a8c465a..cd49ae5 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -244,6 +244,7 @@ static int xhci_plat_suspend(struct device *dev) if (ret) return ret; + usb_phy_shutdown(xhci->shared_hcd->usb_phy); clk_disable_unprepare(xhci->clk); return ret; @@ -259,6 +260,10 @@ static int xhci_plat_resume(struct device *dev) if (ret) return ret; + ret = usb_phy_init(xhci->shared_hcd->usb_phy); + if (ret) + return ret; + return xhci_resume(xhci, 0); } -- 2.6.2