| From a219de7e91ea0bc6d6462c07491da5130cef858d Mon Sep 17 00:00:00 2001 |
| From: Mathias Nyman <mathias.nyman@linux.intel.com> |
| Date: Mon, 21 May 2018 16:39:53 +0300 |
| Subject: [PATCH 1441/1795] xhci: set hcd pointers for xhci usb2 and usb3 |
| roothub structures |
| |
| Allows us to know the correct hcd a xhci roothub and its ports |
| belong to. |
| |
| Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit 9ea95ecc7ffd338a62972ddd6b0ac46bdc5e7d49) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/usb/host/xhci.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c |
| index 5466d4db6ffe..7155659bb920 100644 |
| --- a/drivers/usb/host/xhci.c |
| +++ b/drivers/usb/host/xhci.c |
| @@ -4898,6 +4898,7 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks) |
| |
| if (usb_hcd_is_primary_hcd(hcd)) { |
| xhci->main_hcd = hcd; |
| + xhci->usb2_rhub.hcd = hcd; |
| /* Mark the first roothub as being USB 2.0. |
| * The xHCI driver will register the USB 3.0 roothub. |
| */ |
| @@ -4923,6 +4924,7 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks) |
| minor_rev, |
| minor_rev ? "Enhanced" : ""); |
| |
| + xhci->usb3_rhub.hcd = hcd; |
| /* xHCI private pointer was set in xhci_pci_probe for the second |
| * registered roothub. |
| */ |
| -- |
| 2.19.0 |
| |