diff options
-rw-r--r-- | drivers/usb/host/xhci-hub.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/xhci-mem.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/xhci.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c index 1e96d1f1fe6b..7a62b023b4d1 100644 --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c | |||
@@ -232,7 +232,7 @@ int xhci_find_slot_id_by_port(struct usb_hcd *hcd, struct xhci_hcd *xhci, | |||
232 | continue; | 232 | continue; |
233 | speed = xhci->devs[i]->udev->speed; | 233 | speed = xhci->devs[i]->udev->speed; |
234 | if (((speed == USB_SPEED_SUPER) == (hcd->speed == HCD_USB3)) | 234 | if (((speed == USB_SPEED_SUPER) == (hcd->speed == HCD_USB3)) |
235 | && xhci->devs[i]->port == port) { | 235 | && xhci->devs[i]->fake_port == port) { |
236 | slot_id = i; | 236 | slot_id = i; |
237 | break; | 237 | break; |
238 | } | 238 | } |
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index d873a0330c9e..9afce47e69df 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c | |||
@@ -921,9 +921,9 @@ int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *ud | |||
921 | for (top_dev = udev; top_dev->parent && top_dev->parent->parent; | 921 | for (top_dev = udev; top_dev->parent && top_dev->parent->parent; |
922 | top_dev = top_dev->parent) | 922 | top_dev = top_dev->parent) |
923 | /* Found device below root hub */; | 923 | /* Found device below root hub */; |
924 | dev->port = top_dev->portnum; | 924 | dev->fake_port = top_dev->portnum; |
925 | xhci_dbg(xhci, "Set root hub portnum to %d\n", port_num); | 925 | xhci_dbg(xhci, "Set root hub portnum to %d\n", port_num); |
926 | xhci_dbg(xhci, "Set fake root hub portnum to %d\n", dev->port); | 926 | xhci_dbg(xhci, "Set fake root hub portnum to %d\n", dev->fake_port); |
927 | 927 | ||
928 | /* Is this a LS/FS device under an external HS hub? */ | 928 | /* Is this a LS/FS device under an external HS hub? */ |
929 | if (udev->tt && udev->tt->hub->parent) { | 929 | if (udev->tt && udev->tt->hub->parent) { |
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index cae8e23308bf..bfb3fab20795 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h | |||
@@ -798,7 +798,7 @@ struct xhci_virt_device { | |||
798 | /* Status of the last command issued for this device */ | 798 | /* Status of the last command issued for this device */ |
799 | u32 cmd_status; | 799 | u32 cmd_status; |
800 | struct list_head cmd_list; | 800 | struct list_head cmd_list; |
801 | u8 port; | 801 | u8 fake_port; |
802 | }; | 802 | }; |
803 | 803 | ||
804 | 804 | ||