From: Al Cooper Date: Fri, 3 Jan 2020 18:18:10 +0000 (-0500) Subject: phy: usb: USB driver is crashing during S3 resume on 7216 X-Git-Tag: block-5.6-2020-02-05~32^2~16^2~28 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=5dfe1cec580829faa49842672a25481b104c26ef;p=linux-block.git phy: usb: USB driver is crashing during S3 resume on 7216 This is a result of the USB 2.0 clocks not being disabled/enabled during suspend/resume on XHCI only systems. Signed-off-by: Al Cooper Reviewed-by: Florian Fainelli Signed-off-by: Kishon Vijay Abraham I --- diff --git a/drivers/phy/broadcom/phy-brcm-usb.c b/drivers/phy/broadcom/phy-brcm-usb.c index cc5763ace3ad..1ab44f54244b 100644 --- a/drivers/phy/broadcom/phy-brcm-usb.c +++ b/drivers/phy/broadcom/phy-brcm-usb.c @@ -543,7 +543,7 @@ static int brcm_usb_phy_suspend(struct device *dev) brcm_usb_wake_enable(&priv->ini, true); if (priv->phys[BRCM_USB_PHY_3_0].inited) clk_disable_unprepare(priv->usb_30_clk); - if (priv->phys[BRCM_USB_PHY_2_0].inited) + if (priv->phys[BRCM_USB_PHY_2_0].inited || !priv->has_eohci) clk_disable_unprepare(priv->usb_20_clk); if (priv->wake_irq >= 0) enable_irq_wake(priv->wake_irq);