diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-23 21:49:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-23 21:49:37 +0100 |
| commit | cd0e075784f4bce97b4ed47d4b354f045e895546 (patch) | |
| tree | 2354d4c2f5185c59dc21c537841b55c694cc53ec /drivers/usb/host/xhci-ring.c | |
| parent | usb: phy: msm: Remove dead code (diff) | |
| parent | Linux 4.0-rc5 (diff) | |
| download | linux-cd0e075784f4bce97b4ed47d4b354f045e895546.tar.xz linux-cd0e075784f4bce97b4ed47d4b354f045e895546.zip | |
Merge 4.0-rc5 into usb-next
We want the USB fixes in here as well to resolve merge conflicts.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/xhci-ring.c')
| -rw-r--r-- | drivers/usb/host/xhci-ring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index da2ff5097fcf..d8fb2cdaf8d8 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -1729,7 +1729,7 @@ static void xhci_cleanup_halted_endpoint(struct xhci_hcd *xhci, if (!command) return; - ep->ep_state |= EP_HALTED | EP_RECENTLY_HALTED; + ep->ep_state |= EP_HALTED; ep->stopped_stream = stream_id; xhci_queue_reset_ep(xhci, command, slot_id, ep_index); |