diff options
author | Bin Liu <b-liu@ti.com> | 2016-05-31 11:05:25 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-01 17:58:59 -0400 |
commit | 04471eb8c3158c0ad9df4b24da845a63b2e8f23a (patch) | |
tree | 3f3bbe5bef47d7cd644b35a35dc7041b3d9ec432 /drivers/usb | |
parent | 84ac5d1140f716a616522f952734e850448d2556 (diff) |
usb: musb: host: correct cppi dma channel for isoch transfer
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)
Cc: <stable@vger.kernel.org> # v4.2+
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/usb')
-rw-r--r-- | drivers/usb/musb/musb_host.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index f02361dbfd52..f0931c418f83 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c | |||
@@ -1549,7 +1549,7 @@ static int musb_rx_dma_iso_cppi41(struct dma_controller *dma, | |||
1549 | struct urb *urb, | 1549 | struct urb *urb, |
1550 | size_t len) | 1550 | size_t len) |
1551 | { | 1551 | { |
1552 | struct dma_channel *channel = hw_ep->tx_channel; | 1552 | struct dma_channel *channel = hw_ep->rx_channel; |
1553 | void __iomem *epio = hw_ep->regs; | 1553 | void __iomem *epio = hw_ep->regs; |
1554 | dma_addr_t *buf; | 1554 | dma_addr_t *buf; |
1555 | u32 length, res; | 1555 | u32 length, res; |