summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Campbell <bacam@z273.org.uk>2015-07-21 17:20:28 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-07-22 14:19:36 -0700
commit326124a027abc9a7f43f72dc94f6f0f7a55b02b3 (patch)
tree3369e0da02e0724eab5c420ab01719887f4a5d90
parent3496810663922617d4b706ef2780c279252ddd6a (diff)
downloadop-kernel-dev-326124a027abc9a7f43f72dc94f6f0f7a55b02b3.zip
op-kernel-dev-326124a027abc9a7f43f72dc94f6f0f7a55b02b3.tar.gz
xhci: Calculate old endpoints correctly on device reset
When resetting a device the number of active TTs may need to be corrected by xhci_update_tt_active_eps, but the number of old active endpoints supplied to it was always zero, so the number of TTs and the bandwidth reserved for them was not updated, and could rise unnecessarily. This affected systems using Intel's Patherpoint chipset, which rely on software bandwidth checking. For example, a Lenovo X230 would lose the ability to use ports on the docking station after enough suspend/resume cycles because the bandwidth calculated would rise with every cycle when a suitable device is attached. The correct number of active endpoints is calculated in the same way as in xhci_reserve_bandwidth. Cc: <stable@vger.kernel.org> Signed-off-by: Brian Campbell <bacam@z273.org.uk> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/host/xhci.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 7da0d60..526ebc0 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -3453,6 +3453,9 @@ int xhci_discover_or_reset_device(struct usb_hcd *hcd, struct usb_device *udev)
return -EINVAL;
}
+ if (virt_dev->tt_info)
+ old_active_eps = virt_dev->tt_info->active_eps;
+
if (virt_dev->udev != udev) {
/* If the virt_dev and the udev does not match, this virt_dev
* may belong to another udev.
OpenPOWER on IntegriCloud