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

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

Merge "usb: pd: Fix unbalanced vconn regulator disable"

parents 1acb54a6 abc22dbb
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -1257,8 +1257,11 @@ static void usbpd_sm(struct work_struct *w)
				POWER_SUPPLY_PROP_PD_ACTIVE, &val);

		if (pd->current_pr == PR_SRC) {
			regulator_disable(pd->vconn);
			regulator_disable(pd->vbus);
			if (pd->vconn_enabled) {
				regulator_disable(pd->vconn);
				pd->vconn_enabled = false;
			}
		}

		if (pd->current_dr == DR_UFP)