4.4-stable review patch. If anyone has any objections, please let me know.
------------------ From: Cristian Birsan <[email protected]> commit 4c2ba0c67394514f3f75c660c9f5d02e66a7efd4 upstream. Commit ac33cdb16681 ("usb: musb: Remove ifdefs for musb_host_rx in musb_host.c part5") introduces a problem setting DMA host mode. The musb_advance_schedule() is called immediately after receiving an endpoint RX interrupt without waiting for the DMA transfer to complete. As a consequence when the dma complete interrupt arrives the in_qh member of hw_ep is already null an the musb_host_rx() exits on !urb error case. Fix the done condition that advances the musb schedule. Signed-off-by: Cristian Birsan <[email protected]> Signed-off-by: Joshua Henderson <[email protected]> Tested-by: Ladislav Michl <[email protected]> Signed-off-by: Felipe Balbi <[email protected]> Cc: Tony Lindgren <[email protected]> Cc: Adam Ford <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/usb/musb/musb_host.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c @@ -2008,10 +2008,8 @@ void musb_host_rx(struct musb *musb, u8 qh->offset, urb->transfer_buffer_length); - done = musb_rx_dma_in_inventra_cppi41(c, hw_ep, qh, - urb, xfer_len, - iso_err); - if (done) + if (musb_rx_dma_in_inventra_cppi41(c, hw_ep, qh, urb, + xfer_len, iso_err)) goto finish; else dev_err(musb->controller, "error: rx_dma failed\n");
