4.4-stable review patch. If anyone has any objections, please let me know.
------------------ From: Cristian Birsan <[email protected]> commit bba40e6948b94cba71965285fbac31bd078c024a upstream. Commit 754fe4a92c07 ("usb: musb: Remove ifdefs for TX DMA for musb_host.c") introduces a problem setting the desired channel mode for the Mentor DMA engine. There is a case where an address is incorrectly assigned to the DMA channel desired mode when it should instead be assigned the actual mode value. This results in the value of channel->desired_mode not being correct. Acked-by: Sergei Shtylyov <[email protected]> Signed-off-by: Cristian Birsan <[email protected]> Signed-off-by: Joshua Henderson <[email protected]> Signed-off-by: Felipe Balbi <[email protected]> Cc: Adam Ford <[email protected]> Cc: Tony Lindgren <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/usb/musb/musb_host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c @@ -661,7 +661,7 @@ static int musb_tx_dma_set_mode_mentor(s csr &= ~(MUSB_TXCSR_AUTOSET | MUSB_TXCSR_DMAMODE); csr |= MUSB_TXCSR_DMAENAB; /* against programmer's guide */ } - channel->desired_mode = mode; + channel->desired_mode = *mode; musb_writew(epio, MUSB_TXCSR, csr); return 0;
