Commit 2b13a958 authored by Peter Chen's avatar Peter Chen Committed by Greg Kroah-Hartman

usb: gadget: fix request length error for isoc transfer

commit 982555fc 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 <>
Cc: Felipe Balbi <>
Fixes: 16b114a6 ("usb: gadget: fix usb_ep_align_maybe
  endianness and new usb_ep_aligna")
Signed-off-by: default avatarPeter Chen <>
Signed-off-by: default avatarFelipe Balbi <>
Signed-off-by: default avatarNobuhiro Iwamatsu <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 8b15aae1
......@@ -671,7 +671,9 @@ static inline struct usb_gadget *dev_to_usb_gadget(struct device *dev)
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);
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment