diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-26 14:38:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-26 14:38:13 -0400 |
| commit | db8cbfadcf9073cc6401ebcf90392c5ce6e93f34 (patch) | |
| tree | 9a4c4bc4697d22ad7cb797b46d107a5ab3b4e73f /include/uapi | |
| parent | ab20fb8139b9b3f8abcf83bbddddcc1a757a9247 (diff) | |
| parent | 2c7b871b9102c497ba8f972aa5d38532f05b654d (diff) | |
Merge tag 'usb-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH:
"Here are a number of USB fixes for 3.11-rc3.
Lots of little things, nothing major. A number of new device ids,
build fixes for DMA, and a bunch of other minor things. All of these
have been in the linux-next tree"
* tag 'usb-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (40 commits)
usb: Clear both buffers when clearing a control transfer TT buffer.
usb/gadget: free opts struct on error recovery
USB: mos7840: fix memory leak in open
usb: serial: option.c: remove ONDA MT825UP product ID fromdriver
usb: serial: option: add Olivetti Olicard 200
usb: serial: option: blacklist ONDA MT689DC QMI interface
xhci: fix null pointer dereference on ring_doorbell_for_active_rings
usb: host: xhci: Enable XHCI_SPURIOUS_SUCCESS for all controllers with xhci 1.0
usb: fix build warning in pci-quirks.h when CONFIG_PCI is not enabled
usb: xhci: Mark two functions __maybe_unused
xhci: Avoid NULL pointer deref when host dies.
usb: serial: option: Add ONYX 3G device support
USB: ti_usb_3410_5052: fix dynamic-id matching
usb: option: add TP-LINK MA260
USB: option: add D-Link DWM-152/C1 and DWM-156/C1
USB: EHCI: Fix resume signalling on remote wakeup
USB: cp210x: add MMB and PI ZigBee USB Device Support
usb: cp210x support SEL C662 Vendor/Device
USB: option: append Petatel NP10T device to GSM modems list
USB: misc: Add Manhattan Hi-Speed USB DVI Converter to sisusbvga
...
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/usb/ch11.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/uapi/linux/usb/ch11.h b/include/uapi/linux/usb/ch11.h index 7692dc69ccf7..331499d597fa 100644 --- a/include/uapi/linux/usb/ch11.h +++ b/include/uapi/linux/usb/ch11.h | |||
| @@ -11,6 +11,17 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/types.h> /* __u8 etc */ | 12 | #include <linux/types.h> /* __u8 etc */ |
| 13 | 13 | ||
| 14 | /* This is arbitrary. | ||
| 15 | * From USB 2.0 spec Table 11-13, offset 7, a hub can | ||
| 16 | * have up to 255 ports. The most yet reported is 10. | ||
| 17 | * | ||
| 18 | * Current Wireless USB host hardware (Intel i1480 for example) allows | ||
| 19 | * up to 22 devices to connect. Upcoming hardware might raise that | ||
| 20 | * limit. Because the arrays need to add a bit for hub status data, we | ||
| 21 | * use 31, so plus one evens out to four bytes. | ||
| 22 | */ | ||
| 23 | #define USB_MAXCHILDREN 31 | ||
| 24 | |||
| 14 | /* | 25 | /* |
| 15 | * Hub request types | 26 | * Hub request types |
| 16 | */ | 27 | */ |