Commit 7b59496c authored Mar 12, 2013 by Arnd Bergmann

Merge tag 'davinci-for-v3.9-rc/fixes' of...

Merge tag 'davinci-for-v3.9-rc/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes

Via Sekhar Nori <nsekhar@ti.com>:

This patch fixes a boot breakage on DA830
that was introduced with EDMA DMA engine
conversion. The bug has been there since
v3.7 and has been marked for stable update.

* tag 'davinci-for-v3.9-rc/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

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

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 27f423fe 06955277

arch/arm/mach-davinci/dma.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -743,6 +743,9 @@ EXPORT_SYMBOL(edma_free_channel);
		*/
		int edma_alloc_slot(unsigned ctlr, int slot)
		{
		if (!edma_cc[ctlr])
		return -EINVAL;

		if (slot >= 0)
		slot = EDMA_CHAN_SLOT(slot);

Admin message