diff options
| author | Jonathan Corbet | 2016-12-27 20:53:44 +0100 |
|---|---|---|
| committer | Jonathan Corbet | 2016-12-27 20:53:44 +0100 |
| commit | 54ab6db0909061ab7ee07233d3cab86d29f86e6c (patch) | |
| tree | a7650ab5c0fa3a6a3841de8e8693041b3e009054 /include/linux/usb/gadget.h | |
| parent | docs: sphinx-extensions: make rstFlatTable work with docutils 0.13 (diff) | |
| parent | Linux 4.10-rc1 (diff) | |
| download | kernel-qcow2-linux-54ab6db0909061ab7ee07233d3cab86d29f86e6c.tar.gz kernel-qcow2-linux-54ab6db0909061ab7ee07233d3cab86d29f86e6c.tar.xz kernel-qcow2-linux-54ab6db0909061ab7ee07233d3cab86d29f86e6c.zip | |
Merge tag 'v4.10-rc1' into docs-next
Linux 4.10-rc1
Diffstat (limited to 'include/linux/usb/gadget.h')
| -rw-r--r-- | include/linux/usb/gadget.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h index 8e81f9eb95e4..e4516e9ded0f 100644 --- 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); } /** |