diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-06 17:33:17 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-06 17:33:17 +0100 |
| commit | 0ee8bb9c4864ee826e6c669f230562cd0fed8722 (patch) | |
| tree | 1ce9acff55fd979521cc0ca53cfc04659fbdce61 /drivers/usb/host/ehci-hcd.c | |
| parent | 54cd4bea5a18f7bd5921a76d31eef4c61a68d8e7 (diff) | |
| parent | 926719debff484d9678a324c71e948b7dd60352b (diff) | |
Merge tag 'v3.10.56' into linux-linaro-lsk
This is the 3.10.56 stable release
Diffstat (limited to 'drivers/usb/host/ehci-hcd.c')
| -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 d44d43f293be..f1c3ad69ca54 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -977,8 +977,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: case QH_STATE_COMPLETING: |