Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bba40e69 authored by Cristian Birsan's avatar Cristian Birsan Committed by Felipe Balbi
Browse files

usb: musb: Fix DMA desired mode for Mentor DMA engine 



Commit 754fe4a9 ("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: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarCristian Birsan <cristian.birsan@microchip.com>
Signed-off-by: default avatarJoshua Henderson <joshua.henderson@microchip.com>
Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>
parent 96c7de4f

drivers/usb/musb/musb_host.c

+1 −1
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ static int musb_tx_dma_set_mode_mentor(struct dma_controller *dma, 
		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;