Skip to contentSkip to conversation

Patch "usb: gadget: fix request length error for isoc transfer" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jan 9, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

usb: gadget: fix request length error for isoc transfer

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
usb-gadget-fix-request-length-error-for-isoc-transfer.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 982555fc26f9d8bcdbd5f9db0378fe0682eb4188 Mon Sep 17 00:00:00 2001

From: Peter Chen <[email protected]>
Date: Tue, 8 Nov 2016 10:08:24 +0800
Subject: usb: gadget: fix request length error for isoc transfer

From: Peter Chen <[email protected]>

commit 982555fc26f9d8bcdbd5f9db0378fe0682eb4188 upstream.

For isoc endpoint descriptor, the wMaxPacketSize is not real max packet size (see Table 9-13. Standard Endpoint Descriptor, USB 2.0 specifcation), it may contain the number of packet, so the real max packet should be ep->desc->wMaxPacketSize && 0x7ff.

Cc Felipe F. Tonello <[email protected]>
Cc Felipe Balbi <[email protected]>
Fixes 16b114a6d797 ("usb: gadget: fix usb_ep_align_maybe

endianness and new usb_ep_aligna")

---
 include/linux/usb/gadget.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
include/linux/usb/gadget.h +3 -1
@@ -429,7 +429,9 @@ static inline struct usb_gadget *dev_to_
  */
 static inline size_t usb_ep_align(struct usb_ep *ep, size_t len)
 {
-	return round_up(len, (size_t)le16_to_cpu(ep->desc->wMaxPacketSize));
+	int max_packet_size = (size_t)usb_endpoint_maxp(ep->desc) & 0x7ff;
+
+	return round_up(len, max_packet_size);
 }
 
 /**

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/usb-gadget-fix-request-length-error-for-isoc-transfer.patch