usb: gadget: fix request length error for isoc transfer

Peter Chen · Felipe Balbi · commit 982555fc26f9 · 2016-11-18T13:54:09.000+02:00
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 <eu@felipetonello.com> Cc: Felipe Balbi <felipe.balbi@linux.intel.com> Fixes: 16b114a ("usb: gadget: fix usb_ep_align_maybe endianness and new usb_ep_aligna") Signed-off-by: Peter Chen <peter.chen@nxp.com> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
@@ -429,7 +429,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);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,9 @@ static inline struct usb_gadget dev_to_usb_gadget(struct device dev)`
`429`	`429`	`*/`
`430`	`430`	`static inline size_t usb_ep_align(struct usb_ep *ep, size_t len)`
`431`	`431`	`{`
`432`		`- return round_up(len, (size_t)le16_to_cpu(ep->desc->wMaxPacketSize));`
	`432`	`+ int max_packet_size = (size_t)usb_endpoint_maxp(ep->desc) & 0x7ff;`
	`433`	`+`
	`434`	`+ return round_up(len, max_packet_size);`
`433`	`435`	`}`
`434`	`436`
`435`	`437`	`/**`