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

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

Merge "usb: gadget: Fix incorrect ISOC data transfer PIDs"

parents 7c2b49b9 065e2d2e

drivers/usb/dwc3/gadget.c

+5 −2
Original line number Diff line number Diff line
@@ -846,7 +846,7 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep, 
	struct dwc3_trb		*trb;

	bool			zlp_appended = false;

	unsigned		rlen;

	int			isoc_maxp;

	int			isoc_maxp, max_payload, mult;



	dev_vdbg(dwc->dev, "%s: req %pK dma %08llx length %d%s%s\n",

			dep->name, req, (unsigned long long) dma,
@@ -881,7 +881,10 @@ update_trb: 


	case USB_ENDPOINT_XFER_ISOC:

		isoc_maxp = usb_endpoint_maxp(dep->endpoint.desc);

		trb->size |= DWC3_TRB_SIZE_PCM1(isoc_maxp >> 11);

		max_payload = isoc_maxp & 0x7FF;

		mult = (req->request.length/max_payload) & 0x3;

		trb->size |= DWC3_TRB_SIZE_PCM1(

			(req->request.length%max_payload) ? mult : mult-1);

		if (!node)

			trb->ctrl = DWC3_TRBCTL_ISOCHRONOUS_FIRST;

		else