summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristian Birsan <cristian.birsan@microchip.com>2016-02-11 08:58:17 -0700
committerFelipe Balbi <balbi@kernel.org>2016-02-17 16:32:50 +0200
commitbba40e6948b94cba71965285fbac31bd078c024a (patch)
treeab1d144ce0f23c2e2aadbc442f17ccbaedb93518
parent96c7de4ff41c2ed6da43141a4deb922de09617d0 (diff)
downloadlinux-bba40e6948b94cba71965285fbac31bd078c024a.tar.gz
linux-bba40e6948b94cba71965285fbac31bd078c024a.tar.bz2
linux-bba40e6948b94cba71965285fbac31bd078c024a.zip
usb: musb: Fix DMA desired mode for Mentor DMA engine
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 <sergei.shtylyov@cogentembedded.com> Signed-off-by: Cristian Birsan <cristian.birsan@microchip.com> Signed-off-by: Joshua Henderson <joshua.henderson@microchip.com> Signed-off-by: Felipe Balbi <balbi@kernel.org>
-rw-r--r--drivers/usb/musb/musb_host.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 795a45b1b25b..79d081883628 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -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;