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

Commit f108b2de authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "usb: gadget: composite: always set ep->mult to a sensible value" 



This reverts commit c53af76d which is
commit eaa496ffaaf19591fe471a36cef366146eeb9153 upstream as it was
incorrect.

Reported-by: default avatarBin Liu <b-liu@ti.com>
Cc: Felipe Balbi <balbi@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6053479c

drivers/usb/gadget/composite.c

+2 −7
Original line number Diff line number Diff line
@@ -148,12 +148,7 @@ ep_found: 
	_ep->desc = chosen_desc;

	_ep->comp_desc = NULL;

	_ep->maxburst = 0;

	_ep->mult = 1;



	if (g->speed == USB_SPEED_HIGH && (usb_endpoint_xfer_isoc(_ep->desc) ||

				usb_endpoint_xfer_int(_ep->desc)))

		_ep->mult = usb_endpoint_maxp(_ep->desc) & 0x7ff;



	_ep->mult = 0;

	if (!want_comp_desc)

		return 0;
@@ -170,7 +165,7 @@ ep_found: 
		switch (usb_endpoint_type(_ep->desc)) {

		case USB_ENDPOINT_XFER_ISOC:

			/* mult: bits 1:0 of bmAttributes */

			_ep->mult = (comp_desc->bmAttributes & 0x3) + 1;

			_ep->mult = comp_desc->bmAttributes & 0x3;

		case USB_ENDPOINT_XFER_BULK:

		case USB_ENDPOINT_XFER_INT:

			_ep->maxburst = comp_desc->bMaxBurst + 1;

drivers/usb/gadget/function/uvc_video.c

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ uvc_video_alloc_requests(struct uvc_video *video) 


	req_size = video->ep->maxpacket

		 * max_t(unsigned int, video->ep->maxburst, 1)

		 * (video->ep->mult);

		 * (video->ep->mult + 1);



	for (i = 0; i < UVC_NUM_REQUESTS; ++i) {

		video->req_buffer[i] = kmalloc(req_size, GFP_KERNEL);