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

Commit f8e6a341 authored by Minas Harutyunyan's avatar Minas Harutyunyan Committed by Greg Kroah-Hartman
Browse files

usb: dwc2: Fix in ISOC request length checking 



commit 860ef6cd3f90b84a1832f8a6485c90c34d3b588b upstream.

Moved ISOC request length checking from dwc2_hsotg_start_req() function to
dwc2_hsotg_ep_queue().

Fixes: 4fca54aa ("usb: gadget: s3c-hsotg: add multi count support")
Signed-off-by: default avatarMinas Harutyunyan <hminas@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent de8dbb7b

drivers/usb/dwc2/gadget.c

+7 −5
Original line number Diff line number Diff line
@@ -1004,11 +1004,6 @@ static void dwc2_hsotg_start_req(struct dwc2_hsotg *hsotg, 
	else

		packets = 1;	/* send one packet if length is zero. */



	if (hs_ep->isochronous && length > (hs_ep->mc * hs_ep->ep.maxpacket)) {

		dev_err(hsotg->dev, "req length > maxpacket*mc\n");

		return;

	}



	if (dir_in && index != 0)

		if (hs_ep->isochronous)

			epsize = DXEPTSIZ_MC(packets);
@@ -1312,6 +1307,13 @@ static int dwc2_hsotg_ep_queue(struct usb_ep *ep, struct usb_request *req, 
	req->actual = 0;

	req->status = -EINPROGRESS;



	/* Don't queue ISOC request if length greater than mps*mc */

	if (hs_ep->isochronous &&

	    req->length > (hs_ep->mc * hs_ep->ep.maxpacket)) {

		dev_err(hs->dev, "req length > maxpacket*mc\n");

		return -EINVAL;

	}



	/* In DDMA mode for ISOC's don't queue request if length greater

	 * than descriptor limits.

	 */