diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2011-07-19 20:21:52 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2011-08-01 21:06:37 +0200 |
| commit | a8f21156a07cb0b11fddeab771e11ec7c08283c9 (patch) | |
| tree | 11e20cb45a17bcdb8f8eff2b2ce50b4fc7c9aea8 /drivers/usb/gadget/composite.c | |
| parent | usb: gadget: fusb300: remove #if 0 block (diff) | |
| download | linux-a8f21156a07cb0b11fddeab771e11ec7c08283c9.tar.xz linux-a8f21156a07cb0b11fddeab771e11ec7c08283c9.zip | |
usb: gadget: composite: fix bMaxPacketSize for SuperSpeed
For bMaxPacketSize0 we usually take what is specified in ep0->maxpacket.
This is fine in most cases, however on SuperSpeed bMaxPacketSize0
specifies the exponent instead of the actual size in bytes. The only
valid value on SS is 9 which denotes 512 bytes.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/composite.c')
| -rw-r--r-- | drivers/usb/gadget/composite.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 5ef87794fd32..aef47414f5d5 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -1079,10 +1079,12 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) cdev->desc.bMaxPacketSize0 = cdev->gadget->ep0->maxpacket; if (gadget_is_superspeed(gadget)) { - if (gadget->speed >= USB_SPEED_SUPER) + if (gadget->speed >= USB_SPEED_SUPER) { cdev->desc.bcdUSB = cpu_to_le16(0x0300); - else + cdev->desc.bMaxPacketSize0 = 9; + } else { cdev->desc.bcdUSB = cpu_to_le16(0x0210); + } } value = min(w_length, (u16) sizeof cdev->desc); |