diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-14 10:38:35 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-14 10:38:35 -0700 |
| commit | 07c57548539dbeeb3c4d3766b02eaf4b2d945f8f (patch) | |
| tree | d0e53e8e213fa26a151367f60c7699f5719d898e /drivers/usb/host/xhci.c | |
| parent | 977826e7012c4efebcb5b923d15455ebd468b579 (diff) | |
| parent | 8a7eb06341c73248d152a2a12e4f00f472295de7 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-androidlsk-v3.14-15.08-android
Diffstat (limited to 'drivers/usb/host/xhci.c')
| -rw-r--r-- | drivers/usb/host/xhci.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 16f4f8dc1ae9..fc61e663b00a 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -3424,6 +3424,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. |