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

Commit a1114511 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: disable VBUS/VCONN upon shutdown"

parents c4b807f9 0ab0296d
Loading
Loading
Loading
Loading
+10 −0
Original line number Original line Diff line number Diff line
@@ -1038,6 +1038,16 @@ static void phy_msg_received(struct usbpd *pd, enum pd_sop_type sop,
static void phy_shutdown(struct usbpd *pd)
static void phy_shutdown(struct usbpd *pd)
{
{
	usbpd_dbg(&pd->dev, "shutdown");
	usbpd_dbg(&pd->dev, "shutdown");

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

	if (pd->vbus_enabled) {
		regulator_disable(pd->vbus);
		pd->vbus_enabled = false;
	}
}
}


static enum hrtimer_restart pd_timeout(struct hrtimer *timer)
static enum hrtimer_restart pd_timeout(struct hrtimer *timer)