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

Commit 94c840f8 authored by Ivaylo Georgiev's avatar Ivaylo Georgiev
Browse files

Revert "usb: dwc3: gadget: use num_trbs when skipping TRBs on ->dequeue()" 



This reverts commit 56092bd5.

This is a preparation change for merging android-4.19.57 into
msm-4.19 branch.

Reverted due to BootTimeRunner regression.

Change-Id: I0cb9beb207918073d8a32417ab817002df8f9fab
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
parent acbc01a8

drivers/usb/dwc3/gadget.c

+24 −4
Original line number Diff line number Diff line
@@ -1368,8 +1368,6 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep, 
				break;

		}

		if (r == req) {

			int i;



			/* wait until it is processed */

			dwc3_stop_active_transfer(dep, true);
@@ -1407,13 +1405,33 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep, 
			if (!r->trb)

				goto out0;



			for (i = 0; i < r->num_trbs; i++) {

			if (r->num_pending_sgs) {

				struct dwc3_trb *trb;

				int i = 0;



				for (i = 0; i < r->num_pending_sgs; i++) {

					trb = r->trb + i;

					trb->ctrl &= ~DWC3_TRB_CTRL_HWO;

					dwc3_ep_inc_deq(dep);

				}



				if (r->needs_extra_trb) {

					trb = r->trb + r->num_pending_sgs + 1;

					trb->ctrl &= ~DWC3_TRB_CTRL_HWO;

					dwc3_ep_inc_deq(dep);

				}

			} else {

				struct dwc3_trb *trb = r->trb;



				trb->ctrl &= ~DWC3_TRB_CTRL_HWO;

				dwc3_ep_inc_deq(dep);



				if (r->needs_extra_trb) {

					trb = r->trb + 1;

					trb->ctrl &= ~DWC3_TRB_CTRL_HWO;

					dwc3_ep_inc_deq(dep);

				}

			}

			goto out1;

		}

		dev_err(dwc->dev, "request %pK was not queued to %s\n",
@@ -1423,6 +1441,8 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep, 
	}



out1:

	/* giveback the request */



	dwc3_gadget_giveback(dep, req, -ECONNRESET);



out0: