projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux...
[linux-2.6-block.git]
/
arch
/
arm
/
mach-davinci
/
dma.c
diff --git
a/arch/arm/mach-davinci/dma.c
b/arch/arm/mach-davinci/dma.c
index a685e9706b7ba305b462b103899398b3521f2917..45b7c71d9cc1966bb514862364b5180cdd307060 100644
(file)
--- 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);