summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBin Liu <b-liu@ti.com>2016-05-31 10:05:25 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-07-11 09:31:13 -0700
commitfaa1dbbed20150a1f6b350afba1f95087b4abff4 (patch)
treef121a88c7bb91dd6ac5c66c7a1a922f815327fd8 /drivers
parenta8f7a6d2ce8a480c48afe2ce3164c66c870bf323 (diff)
usb: musb: host: correct cppi dma channel for isoch transfer
commit 04471eb8c3158c0ad9df4b24da845a63b2e8f23a upstream. Incorrect cppi dma channel is referenced in musb_rx_dma_iso_cppi41(), which causes kernel NULL pointer reference oops later when calling cppi41_dma_channel_program(). Fixes: 069a3fd (usb: musb: Remove ifdefs for musb_host_rx in musb_host.c part1) Reported-by: Matwey V. Kornilov <matwey@sai.msu.ru> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Bin Liu <b-liu@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-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 7955768d3b1a..59a63a0b7985 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -1556,7 +1556,7 @@ static int musb_rx_dma_iso_cppi41(struct dma_controller *dma,
struct urb *urb,
size_t len)
{
- struct dma_channel *channel = hw_ep->tx_channel;
+ struct dma_channel *channel = hw_ep->rx_channel;
void __iomem *epio = hw_ep->regs;
dma_addr_t *buf;
u32 length, res;