aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/dma.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-davinci/dma.c')
-rw-r--r--arch/arm/mach-davinci/dma.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/mach-davinci/dma.c
index 89ce3e1a7ab1..8eda4c3be940 100644
--- a/arch/arm/mach-davinci/dma.c
+++ b/arch/arm/mach-davinci/dma.c
@@ -771,8 +771,9 @@ int edma_alloc_cont_slots(unsigned ctlr, unsigned int id, int slot, int count)
771 * the number of channels and lesser than the total number 771 * the number of channels and lesser than the total number
772 * of slots 772 * of slots
773 */ 773 */
774 if (slot < edma_info[ctlr]->num_channels || 774 if ((id != EDMA_CONT_PARAMS_ANY) &&
775 slot >= edma_info[ctlr]->num_slots) 775 (slot < edma_info[ctlr]->num_channels ||
776 slot >= edma_info[ctlr]->num_slots))
776 return -EINVAL; 777 return -EINVAL;
777 778
778 /* 779 /*