diff options
| author | David S. Miller <davem@davemloft.net> | 2014-09-08 06:41:53 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-08 06:41:53 +0200 |
| commit | eb84d6b60491a3ca3d90d62ee5346b007770d40d (patch) | |
| tree | 22aadf9ada15e1ae5ba4c400aafab6f2541996e6 /drivers/usb/host/xhci.c | |
| parent | net: phy: mdio-sun4i: don't select REGULATOR (diff) | |
| parent | Merge branch 'for-3.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-eb84d6b60491a3ca3d90d62ee5346b007770d40d.tar.xz linux-eb84d6b60491a3ca3d90d62ee5346b007770d40d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
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 b6f21175b872..c020b094fe7d 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -2880,6 +2880,9 @@ void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci, ep_index, ep->stopped_stream, ep->stopped_td, &deq_state); + if (!deq_state.new_deq_ptr || !deq_state.new_deq_seg) + return; + /* HW with the reset endpoint quirk will use the saved dequeue state to * issue a configure endpoint command later. */ |