Commit 06955277 authored by Matt Porter's avatar Matt Porter Committed by Sekhar Nori

ARM: davinci: edma: fix dmaengine induced null pointer dereference on da830

This adds additional error checking to the private edma api implementation
to catch the case where the edma_alloc_slot() has an invalid controller
parameter. The edma dmaengine wrapper driver relies on this condition
being handled in order to avoid setting up a second edma dmaengine
instance on DA830.

Verfied using a DA850 with the second EDMA controller platform instance
removed to simulate a DA830 which only has a single EDMA controller.
Reported-by: default avatarTomas Novotny <tomas@novotny.cz>
Signed-off-by: default avatarMatt Porter <mporter@ti.com>
Cc: stable@vger.kernel.org # v3.7.x+
Tested-by: default avatarTomas Novotny <tomas@novotny.cz>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 6dbe51c2
...@@ -743,6 +743,9 @@ EXPORT_SYMBOL(edma_free_channel); ...@@ -743,6 +743,9 @@ EXPORT_SYMBOL(edma_free_channel);
*/ */
int edma_alloc_slot(unsigned ctlr, int slot) int edma_alloc_slot(unsigned ctlr, int slot)
{ {
if (!edma_cc[ctlr])
return -EINVAL;
if (slot >= 0) if (slot >= 0)
slot = EDMA_CHAN_SLOT(slot); slot = EDMA_CHAN_SLOT(slot);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment