From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932136AbbLGMxi (ORCPT ); Mon, 7 Dec 2015 07:53:38 -0500 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:4169 "EHLO mx0a-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932074AbbLGMxg (ORCPT ); Mon, 7 Dec 2015 07:53:36 -0500 From: Jisheng Zhang To: , CC: , , , Jisheng Zhang Subject: [PATCH v2 3/7] usb: xhci: plat: Fix suspend/resume when the optional usb_phy exists Date: Mon, 7 Dec 2015 20:49:20 +0800 Message-ID: <1449492564-4803-4-git-send-email-jszhang@marvell.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1449492564-4803-1-git-send-email-jszhang@marvell.com> References: <1449492564-4803-1-git-send-email-jszhang@marvell.com> MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2015-12-07_09:,, 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-1512070206 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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