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

Commit fe8c094f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "dwc3: Don't perform set xfer resource from EP_OP_CONFIG for GSI endpoint"

parents d2deb0f3 940ae309

drivers/usb/dwc3/dwc3-msm.c

+0 −6
Original line number Diff line number Diff line
@@ -1624,17 +1624,11 @@ static void gsi_configure_ep(struct usb_ep *ep, struct usb_gsi_request *request) 


	dwc3_send_gadget_ep_cmd(dep, DWC3_DEPCMD_SETEPCONFIG, &params);



	/* Set XferRsc Index for GSI EP */

	if (!(dep->flags & DWC3_EP_ENABLED)) {

		ret = dwc3_gadget_resize_tx_fifos(dwc, dep);

		if (ret)

			return;



		memset(&params, 0x00, sizeof(params));

		params.param0 = DWC3_DEPXFERCFG_NUM_XFER_RES(1);

		dwc3_send_gadget_ep_cmd(dep,

				DWC3_DEPCMD_SETTRANSFRESOURCE, &params);



		dep->endpoint.desc = desc;

		dep->endpoint.comp_desc = comp_desc;

		dep->type = usb_endpoint_type(desc);

drivers/usb/dwc3/gadget.c

+1 −5
Original line number Diff line number Diff line
@@ -622,11 +622,7 @@ static int dwc3_gadget_start_config(struct dwc3_ep *dep) 
	for (i = 0; i < DWC3_ENDPOINTS_NUM; i++) {

		struct dwc3_ep *dep = dwc->eps[i];



		/*

		 * Don't set xfer resource with USB GSI endpoint as it is

		 * performed before enabling USB GSI endpoint.

		 */

		if (!dep || dep->gsi)

		if (!dep)

			continue;



		ret = dwc3_gadget_set_xfer_resource(dep);