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

Commit 7b6bc07a authored by Thomas Pugliese's avatar Thomas Pugliese Committed by Greg Kroah-Hartman
Browse files

usb: wusbcore: set the RPIPE wMaxPacketSize value correctly 



For isochronous endpoints, set the RPIPE wMaxPacketSize value using
wOverTheAirPacketSize from the endpoint companion descriptor instead of
wMaxPacketSize from the normal endpoint descriptor.

Signed-off-by: default avatarThomas Pugliese <thomas.pugliese@gmail.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent df101c53

drivers/usb/wusbcore/wa-rpipe.c

+4 −1
Original line number Diff line number Diff line
@@ -334,7 +334,10 @@ static int rpipe_aim(struct wa_rpipe *rpipe, struct wahc *wa, 
	/* FIXME: compute so seg_size > ep->maxpktsize */

	rpipe->descr.wBlocks = cpu_to_le16(16);		/* given */

	/* ep0 maxpktsize is 0x200 (WUSB1.0[4.8.1]) */

	rpipe->descr.wMaxPacketSize = cpu_to_le16(ep->desc.wMaxPacketSize);

	if (usb_endpoint_xfer_isoc(&ep->desc))

		rpipe->descr.wMaxPacketSize = epcd->wOverTheAirPacketSize;

	else

		rpipe->descr.wMaxPacketSize = ep->desc.wMaxPacketSize;



	rpipe->descr.hwa_bMaxBurst = max(min_t(unsigned int,

				epcd->bMaxBurst, 16U), 1U);