diff options
| author | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2010-07-10 17:48:01 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-02 21:30:02 +0400 |
| commit | e2891450bf1461078fb7b345f758c17451e6105b (patch) | |
| tree | d69994e7d8235ba7d8cf426865fbbc7eb6cebb8d | |
| parent | a9558dd8eda25d345cbb13155de05b289348ec11 (diff) | |
| download | linux-e2891450bf1461078fb7b345f758c17451e6105b.tar.xz | |
USB: xhci: Set Mult field in endpoint context correctly.
commit c30c791c946a14a03e87819eced562ed28711961 upstream.
The bmAttributes field of the SuperSpeed Endpoint Companion Descriptor has
different meanings, depending on the endpoint type. If the endpoint is
isochronous, the bmAttributes field is the maximum number of packets
within a service interval that this endpoint supports. If the endpoint is
bulk, it's the number of stream IDs this endpoint supports.
Only set the Mult field of the xHCI endpoint context using the
bmAttributes field if the endpoint is isochronous, and the device is a
SuperSpeed device.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/usb/host/xhci-mem.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index d64f5724bfc4..e560dd45dac1 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -582,7 +582,7 @@ static inline unsigned int xhci_get_endpoint_interval(struct usb_device *udev, return EP_INTERVAL(interval); } -/* The "Mult" field in the endpoint context is only set for SuperSpeed devices. +/* The "Mult" field in the endpoint context is only set for SuperSpeed isoc eps. * High speed endpoint descriptors can define "the number of additional * transaction opportunities per microframe", but that goes in the Max Burst * endpoint context field. @@ -590,7 +590,8 @@ static inline unsigned int xhci_get_endpoint_interval(struct usb_device *udev, static inline u32 xhci_get_endpoint_mult(struct usb_device *udev, struct usb_host_endpoint *ep) { - if (udev->speed != USB_SPEED_SUPER || !ep->ss_ep_comp) + if (udev->speed != USB_SPEED_SUPER || !ep->ss_ep_comp || + !usb_endpoint_xfer_isoc(&ep->desc)) return 0; return ep->ss_ep_comp->desc.bmAttributes; } |