]>
Commit | Line | Data |
---|---|---|
e370d1cd GKH |
1 | From 04471eb8c3158c0ad9df4b24da845a63b2e8f23a Mon Sep 17 00:00:00 2001 |
2 | From: Bin Liu <b-liu@ti.com> | |
3 | Date: Tue, 31 May 2016 10:05:25 -0500 | |
4 | Subject: usb: musb: host: correct cppi dma channel for isoch transfer | |
5 | ||
6 | From: Bin Liu <b-liu@ti.com> | |
7 | ||
8 | commit 04471eb8c3158c0ad9df4b24da845a63b2e8f23a upstream. | |
9 | ||
10 | Incorrect cppi dma channel is referenced in musb_rx_dma_iso_cppi41(), | |
11 | which causes kernel NULL pointer reference oops later when calling | |
12 | cppi41_dma_channel_program(). | |
13 | ||
14 | Fixes: 069a3fd (usb: musb: Remove ifdefs for musb_host_rx in musb_host.c | |
15 | part1) | |
16 | ||
17 | Reported-by: Matwey V. Kornilov <matwey@sai.msu.ru> | |
18 | Acked-by: Tony Lindgren <tony@atomide.com> | |
19 | Signed-off-by: Bin Liu <b-liu@ti.com> | |
20 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
21 | ||
22 | --- | |
23 | drivers/usb/musb/musb_host.c | 2 +- | |
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
25 | ||
26 | --- a/drivers/usb/musb/musb_host.c | |
27 | +++ b/drivers/usb/musb/musb_host.c | |
28 | @@ -1556,7 +1556,7 @@ static int musb_rx_dma_iso_cppi41(struct | |
29 | struct urb *urb, | |
30 | size_t len) | |
31 | { | |
32 | - struct dma_channel *channel = hw_ep->tx_channel; | |
33 | + struct dma_channel *channel = hw_ep->rx_channel; | |
34 | void __iomem *epio = hw_ep->regs; | |
35 | dma_addr_t *buf; | |
36 | u32 length, res; |