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

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

Merge "dwc3-msm: Return zero if max speed requested is already active"

parents 4863cdca b266d3d2

drivers/usb/dwc3/dwc3-msm.c

+1 −1
Original line number Diff line number Diff line
@@ -4100,7 +4100,7 @@ static int dwc3_restart_usb_host_mode(struct notifier_block *nb, 


	usb_speed = (event == 0 ? USB_SPEED_HIGH : USB_SPEED_SUPER);

	if (dwc->maximum_speed == usb_speed)

		goto err;

		return 0;



	dbg_event(0xFF, "fw_restarthost", 0);

	flush_delayed_work(&mdwc->sm_work);

drivers/usb/pd/policy_engine.c

+1 −0
Original line number Diff line number Diff line
@@ -1818,6 +1818,7 @@ static void reset_vdm_state(struct usbpd *pd) 
	pd->num_svids = 0;

	kfree(pd->vdm_tx);

	pd->vdm_tx = NULL;

	pd->ss_lane_svid = 0x0;

}



static void dr_swap(struct usbpd *pd)