diff options
| author | Arnd Bergmann | 2013-03-12 15:04:06 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2013-03-12 15:04:06 +0100 |
| commit | 7b59496c11747cd715995874177dafd50c8a0115 (patch) | |
| tree | 58ba1c05306182a50606f63cbfbafb0faa90d7f4 /arch/arm | |
| parent | ARM: spear3xx: Use correct pl080 header file (diff) | |
| parent | ARM: davinci: edma: fix dmaengine induced null pointer dereference on da830 (diff) | |
| download | kernel-qcow2-linux-7b59496c11747cd715995874177dafd50c8a0115.tar.gz kernel-qcow2-linux-7b59496c11747cd715995874177dafd50c8a0115.tar.xz kernel-qcow2-linux-7b59496c11747cd715995874177dafd50c8a0115.zip | |
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-davinci/dma.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/mach-davinci/dma.c index a685e9706b7b..45b7c71d9cc1 100644 --- a/arch/arm/mach-davinci/dma.c +++ b/arch/arm/mach-davinci/dma.c @@ -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); |