diff options
| author | Tom Rini <trini@ti.com> | 2013-06-12 16:33:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-06-12 16:33:49 -0400 |
| commit | b7ab8b8ff092ab8214eeb86e8a79573154f448b9 (patch) | |
| tree | 0594417cbd3052fd0232d0b967c7bb240e374df9 /include/linux | |
| parent | 077becc345717c3cf32e88316298b74d0cff6581 (diff) | |
| parent | c67b0e42a59c7ef15495bfde006398abaf2f562f (diff) | |
| download | u-boot-imx-b7ab8b8ff092ab8214eeb86e8a79573154f448b9.zip u-boot-imx-b7ab8b8ff092ab8214eeb86e8a79573154f448b9.tar.gz u-boot-imx-b7ab8b8ff092ab8214eeb86e8a79573154f448b9.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/usb/ch9.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h index d1d732c..bd48704 100644 --- a/include/linux/usb/ch9.h +++ b/include/linux/usb/ch9.h @@ -35,6 +35,7 @@ #include <linux/types.h> /* __u8 etc */ #include <asm/byteorder.h> /* le16_to_cpu */ +#include <asm/unaligned.h> /* get_unaligned() */ /*-------------------------------------------------------------------------*/ @@ -596,7 +597,7 @@ static inline int usb_endpoint_is_isoc_out( */ static inline int usb_endpoint_maxp(const struct usb_endpoint_descriptor *epd) { - return __le16_to_cpu(epd->wMaxPacketSize); + return __le16_to_cpu(get_unaligned(&epd->wMaxPacketSize)); } static inline int usb_endpoint_interrupt_type( |