Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7665bbcc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "USB: dwc3-msm: Fix USB connection issue after DCP charger disconnection"

parents e1d32160 7778c3b8

drivers/usb/dwc3/dwc3-msm.c

+5 −5
Original line number Diff line number Diff line
@@ -1254,11 +1254,6 @@ static void dwc3_start_chg_det(struct dwc3_charger *charger, bool start) 
{

	struct dwc3_msm *mdwc = container_of(charger, struct dwc3_msm, charger);



	/* Skip if charger type was already detected externally */

	if (mdwc->chg_state == USB_CHG_STATE_DETECTED &&

		charger->chg_type != DWC3_INVALID_CHARGER)

		return;



	if (start == false) {

		dev_dbg(mdwc->dev, "canceling charging detection work\n");

		cancel_delayed_work_sync(&mdwc->chg_work);
@@ -1267,6 +1262,11 @@ static void dwc3_start_chg_det(struct dwc3_charger *charger, bool start) 
		return;

	}



	/* Skip if charger type was already detected externally */

	if (mdwc->chg_state == USB_CHG_STATE_DETECTED &&

		charger->chg_type != DWC3_INVALID_CHARGER)

		return;



	mdwc->chg_state = USB_CHG_STATE_UNDEFINED;

	charger->chg_type = DWC3_INVALID_CHARGER;

	queue_delayed_work(system_nrt_wq, &mdwc->chg_work, 0);