diff options
| author | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2010-12-16 10:49:09 -0800 |
|---|---|---|
| committer | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2011-03-13 18:23:38 -0700 |
| commit | 5233630fcdd6f7d415dcbed264031439cab73f9d (patch) | |
| tree | f877073953835d8989c83ab8473cf2100b64dd84 /drivers/usb/host/xhci-ring.c | |
| parent | 20b67cf51fa606442bb343afad0ee1a393a6afb3 (diff) | |
| download | linux-5233630fcdd6f7d415dcbed264031439cab73f9d.tar.gz linux-5233630fcdd6f7d415dcbed264031439cab73f9d.tar.bz2 linux-5233630fcdd6f7d415dcbed264031439cab73f9d.zip | |
xhci: Change xhci_find_slot_id_by_port() API.
xhci_find_slot_id_by_port() tries to map the port index to the slot ID for
the USB device. In the future, there will be two xHCI roothubs, and their
port indices will overlap. Therefore, xhci_find_slot_id_by_port() will
need to use information in the roothub's usb_hcd structure to map the port
index and roothub speed to the right slot ID.
Add a new parameter to xhci_find_slot_id_by_port(), in order to pass in
the roothub's usb_hcd structure.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Diffstat (limited to 'drivers/usb/host/xhci-ring.c')
| -rw-r--r-- | drivers/usb/host/xhci-ring.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 7cea2483e593..7fe9aebd3922 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -1213,7 +1213,8 @@ static void handle_port_status(struct xhci_hcd *xhci, temp &= ~PORT_PLS_MASK; temp |= PORT_LINK_STROBE | XDEV_U0; xhci_writel(xhci, temp, port_array[faked_port_index]); - slot_id = xhci_find_slot_id_by_port(xhci, port_id); + slot_id = xhci_find_slot_id_by_port(hcd, xhci, + faked_port_index); if (!slot_id) { xhci_dbg(xhci, "slot_id is zero\n"); goto cleanup; |