Merge "usb: pd: Ensure disconnect is processed when hard reset in progress"

drivers/usb/pd/policy_engine.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2101,7 +2101,8 @@ static void usbpd_sm(struct work_struct *w)

		/* Disconnect? */
		if (pd->current_pr == PR_NONE) {
		if (pd->current_state == PE_UNKNOWN)
		if (pd->current_state == PE_UNKNOWN &&
		pd->current_dr == DR_NONE)
		goto sm_done;

		if (pd->vconn_enabled) {