diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-22 06:46:16 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-22 06:46:16 -0700 |
| commit | 6ca01a1b451de067462368bd9737efb7accb291c (patch) | |
| tree | 0ad34cabdd0b2ab580a993a6125319d2d840644f /drivers/usb/host | |
| parent | 93177d1f562e4c33871dcf8272e5f8686c73eff1 (diff) | |
| parent | 0f33be009b89d2268e94194dc4fd01a7851b6d51 (diff) | |
| download | op-kernel-dev-6ca01a1b451de067462368bd9737efb7accb291c.zip op-kernel-dev-6ca01a1b451de067462368bd9737efb7accb291c.tar.gz | |
Merge 3.17-rc6 into usb-next
We want the USB fixes in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 81cda09..488a308 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -965,8 +965,6 @@ rescan: } qh->exception = 1; - if (ehci->rh_state < EHCI_RH_RUNNING) - qh->qh_state = QH_STATE_IDLE; switch (qh->qh_state) { case QH_STATE_LINKED: WARN_ON(!list_empty(&qh->qtd_list)); |
