diff options
author | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2009-09-04 13:53:19 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-23 09:46:40 -0400 |
commit | 07b6de102843b717ecd962cf35ec4ad9b1fbed9d (patch) | |
tree | e95849597a5affd6682e1e48c813bc645912f67a /drivers/usb/host/xhci-mem.c | |
parent | 4a0cd9670f22c308bc5936ee9734d8ee3f1baa52 (diff) |
USB: xhci: Set multi-TT field for LS/FS devices under hubs.
When setting up a slot context for an address device command, set the
multi-TT field if this is a low or full speed device under a HS hub with
multiple transaction translators.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/xhci-mem.c')
-rw-r--r-- | drivers/usb/host/xhci-mem.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index e046f0f6ee6a..1db4fea8c170 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c | |||
@@ -390,14 +390,12 @@ int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *ud | |||
390 | xhci_dbg(xhci, "Set root hub portnum to %d\n", top_dev->portnum); | 390 | xhci_dbg(xhci, "Set root hub portnum to %d\n", top_dev->portnum); |
391 | 391 | ||
392 | /* Is this a LS/FS device under a HS hub? */ | 392 | /* Is this a LS/FS device under a HS hub? */ |
393 | /* | ||
394 | * FIXME: I don't think this is right, where does the TT info for the | ||
395 | * roothub or parent hub come from? | ||
396 | */ | ||
397 | if ((udev->speed == USB_SPEED_LOW || udev->speed == USB_SPEED_FULL) && | 393 | if ((udev->speed == USB_SPEED_LOW || udev->speed == USB_SPEED_FULL) && |
398 | udev->tt) { | 394 | udev->tt) { |
399 | slot_ctx->tt_info = udev->tt->hub->slot_id; | 395 | slot_ctx->tt_info = udev->tt->hub->slot_id; |
400 | slot_ctx->tt_info |= udev->ttport << 8; | 396 | slot_ctx->tt_info |= udev->ttport << 8; |
397 | if (udev->tt->multi) | ||
398 | slot_ctx->dev_info |= DEV_MTT; | ||
401 | } | 399 | } |
402 | xhci_dbg(xhci, "udev->tt = %p\n", udev->tt); | 400 | xhci_dbg(xhci, "udev->tt = %p\n", udev->tt); |
403 | xhci_dbg(xhci, "udev->ttport = 0x%x\n", udev->ttport); | 401 | xhci_dbg(xhci, "udev->ttport = 0x%x\n", udev->ttport); |