From 72dbbf7aa1992dc28ed3a2c97b349fb2973beec4 Mon Sep 17 00:00:00 2001 From: Sandeep Paulraj Date: Wed, 16 Sep 2009 18:17:43 -0400 Subject: [PATCH] --- yaml --- r: 173319 b: refs/heads/master c: 6b0cf4e93c3212810f775967bdb2206be65eccec h: refs/heads/master i: 173317: 4529966e52fa3eddf3b0e53f26d703cdcad17872 173315: dbcf5611cc9f55759700b5e77642a545dca86da7 173311: faa1a28aea6690682f69ce1409532941753df07a v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-davinci/dma.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b5debcdad512..38f5a3505237 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51c99e0498c637bf43fb3be786d121d8dceef337 +refs/heads/master: 6b0cf4e93c3212810f775967bdb2206be65eccec diff --git a/trunk/arch/arm/mach-davinci/dma.c b/trunk/arch/arm/mach-davinci/dma.c index 89ce3e1a7ab1..8eda4c3be940 100644 --- a/trunk/arch/arm/mach-davinci/dma.c +++ b/trunk/arch/arm/mach-davinci/dma.c @@ -771,8 +771,9 @@ int edma_alloc_cont_slots(unsigned ctlr, unsigned int id, int slot, int count) * the number of channels and lesser than the total number * of slots */ - if (slot < edma_info[ctlr]->num_channels || - slot >= edma_info[ctlr]->num_slots) + if ((id != EDMA_CONT_PARAMS_ANY) && + (slot < edma_info[ctlr]->num_channels || + slot >= edma_info[ctlr]->num_slots)) return -EINVAL; /*