diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-09 13:50:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-09 13:50:54 -0800 |
| commit | fe250923bbbbcbccc9aa7b84d05ee7a060450534 (patch) | |
| tree | ece7eb383ca568dd7480a50827ec6e65f4fbb562 /include | |
| parent | 690d137f448d4c4da9001871e6569d5636f116c7 (diff) | |
| parent | 90451e6973a5da155c6f315a409ca0a8d3ce6b76 (diff) | |
| download | linux-fe250923bbbbcbccc9aa7b84d05ee7a060450534.tar.gz linux-fe250923bbbbcbccc9aa7b84d05ee7a060450534.tar.bz2 linux-fe250923bbbbcbccc9aa7b84d05ee7a060450534.zip | |
Merge tag 'usb-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
USB fixes for 3.3-rc3
Here are a few minor USB fixes and a bunch of device id updates for the
USB drivers.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* tag 'usb-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
USB: usbserial: add new PID number (0xa951) to the ftdi driver
usb: ch9.h: usb_endpoint_maxp() uses __le16_to_cpu()
usb: musb: fix a build error on mips
uwb & wusb & usb wireless controllers: fix kconfig error & build errors
usb: Skip PCI USB quirk handling for Netlogic XLP
powerpc/usb: fix issue of CPU halt when missing USB PHY clock
usb: otg: mv_otg: Add dependence
usb: host: Distinguish Kconfig text for Freescale controllers
USB: add new zte 3g-dongle's pid to option.c
usb: ch9.h: usb_endpoint_maxp() uses __le16_to_cpu()
USB: qcserial: don't enable autosuspend
USB: qcserial: add several new serial devices
usb: otg: mv_otg: Add dependence
usb: gadget: zero: fix bug in loopback autoresume handling
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb/ch9.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h index 61b29057b054..3b6f628880f8 100644 --- a/include/linux/usb/ch9.h +++ b/include/linux/usb/ch9.h @@ -589,7 +589,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(epd->wMaxPacketSize); } /*-------------------------------------------------------------------------*/ |