Merge "USB: phy: Disable IRQs before resetting clocks" (30b03075) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/usb/phy/phy-msm-usb.c

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -746,12 +746,24 @@ static int msm_otg_reset(struct usb_phy *phy)
	}		}
	motg->reset_counter++;		motg->reset_counter++;

			disable_irq(motg->irq);
			if (motg->phy_irq)
			disable_irq(motg->phy_irq);

	ret = msm_otg_phy_reset(motg);		ret = msm_otg_phy_reset(motg);
	if (ret) {		if (ret) {
	dev_err(phy->dev, "phy_reset failed\n");		dev_err(phy->dev, "phy_reset failed\n");
			if (motg->phy_irq)
			enable_irq(motg->phy_irq);

			enable_irq(motg->irq);
	return ret;		return ret;
	}		}

			if (motg->phy_irq)
			enable_irq(motg->phy_irq);

			enable_irq(motg->irq);
	ret = msm_otg_link_reset(motg);		ret = msm_otg_link_reset(motg);
	if (ret) {		if (ret) {
	dev_err(phy->dev, "link reset failed\n");		dev_err(phy->dev, "link reset failed\n");