| From 6aa7a961938db0c6a530a035fb0812f9330aafcb Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <johan@kernel.org> |
| Date: Wed, 10 May 2017 18:18:30 +0200 |
| Subject: [PATCH 218/286] USB: host: xhci: use max-port define |
| |
| Use the new define for the maximum number of SuperSpeed ports instead of |
| a constant when allocating xHCI root hubs. |
| |
| Signed-off-by: Johan Hovold <johan@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit 5120a266928a07231d198bb518f6fe73148786a3) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/usb/host/xhci-mem.c | 7 ++++--- |
| 1 file changed, 4 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/usb/host/xhci-mem.c |
| +++ b/drivers/usb/host/xhci-mem.c |
| @@ -2325,10 +2325,11 @@ static int xhci_setup_port_arrays(struct |
| /* Place limits on the number of roothub ports so that the hub |
| * descriptors aren't longer than the USB core will allocate. |
| */ |
| - if (xhci->num_usb3_ports > 15) { |
| + if (xhci->num_usb3_ports > USB_SS_MAXPORTS) { |
| xhci_dbg_trace(xhci, trace_xhci_dbg_init, |
| - "Limiting USB 3.0 roothub ports to 15."); |
| - xhci->num_usb3_ports = 15; |
| + "Limiting USB 3.0 roothub ports to %u.", |
| + USB_SS_MAXPORTS); |
| + xhci->num_usb3_ports = USB_SS_MAXPORTS; |
| } |
| if (xhci->num_usb2_ports > USB_MAXCHILDREN) { |
| xhci_dbg_trace(xhci, trace_xhci_dbg_init, |
