Merge "USB: PHY: msm: Don't overwrite id_state in sm_init if it is not cleared"

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -2589,6 +2589,7 @@ static void msm_otg_init_sm(struct msm_otg *motg)
		break;
		}
		msm_otg_dbg_log_event(&motg->phy, "SM INIT", pdata->mode, motg->inputs);
		if (motg->id_state != USB_ID_GROUND)
		motg->id_state = (test_bit(ID, &motg->inputs)) ? USB_ID_FLOAT :
		USB_ID_GROUND;
		}