Merge "usb: phy-msm-usb: don't power collapse PHY during peripheral bus suspend"

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1082,7 +1082,7 @@ phcd_retry:
		}

		if (motg->caps & ALLOW_PHY_POWER_COLLAPSE &&
		!host_bus_suspend && !dcp) {
		!host_bus_suspend && !dcp && !device_bus_suspend) {
		msm_hsusb_ldo_enable(motg, USB_PHY_REG_OFF);
		motg->lpm_flags \|= PHY_PWR_COLLAPSED;
		} else if (motg->caps & ALLOW_PHY_REGULATORS_LPM &&