]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
xhci-mtk: use xhci hub structures to get number of ports in roothubs
authorMathias Nyman <mathias.nyman@linux.intel.com>
Mon, 21 May 2018 13:40:03 +0000 (16:40 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 24 May 2018 16:03:08 +0000 (18:03 +0200)
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/xhci-mtk-sch.c

index eea7360a18fcb271885b16ca4629a40950f11c3b..fa33d6e5b1cbd8aaab17c4995088d1b544530530 100644 (file)
@@ -58,7 +58,7 @@ static int get_bw_index(struct xhci_hcd *xhci, struct usb_device *udev,
                        bw_index = (virt_dev->real_port - 1) * 2 + 1;
        } else {
                /* add one more for each SS port */
-               bw_index = virt_dev->real_port + xhci->num_usb3_ports - 1;
+               bw_index = virt_dev->real_port + xhci->usb3_rhub.num_ports - 1;
        }
 
        return bw_index;
@@ -284,7 +284,7 @@ int xhci_mtk_sch_init(struct xhci_hcd_mtk *mtk)
        int i;
 
        /* ss IN and OUT are separated */
-       num_usb_bus = xhci->num_usb3_ports * 2 + xhci->num_usb2_ports;
+       num_usb_bus = xhci->usb3_rhub.num_ports * 2 + xhci->usb2_rhub.num_ports;
 
        sch_array = kcalloc(num_usb_bus, sizeof(*sch_array), GFP_KERNEL);
        if (sch_array == NULL)