From 65eeb32c96d2c24247de2f6799d9af0b445f32ce Mon Sep 17 00:00:00 2001
From: Sandeep Paulraj <s-paulraj@ti.com>
Date: Sun, 20 Sep 2009 13:47:03 -0400
Subject: [PATCH] --- yaml --- r: 173322 b: refs/heads/master c:
 cc93fc3f34552e791e480ac21a17eceb9c0e26f2 h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/arch/arm/mach-davinci/dma.c | 32 +++++++++++++++++++++++--------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 60934bfe028a..5cbfdb9afd72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc4c05a5131d691ccbc06c2e670385127871bdbe
+refs/heads/master: cc93fc3f34552e791e480ac21a17eceb9c0e26f2
diff --git a/trunk/arch/arm/mach-davinci/dma.c b/trunk/arch/arm/mach-davinci/dma.c
index 8eda4c3be940..b097592a862e 100644
--- a/trunk/arch/arm/mach-davinci/dma.c
+++ b/trunk/arch/arm/mach-davinci/dma.c
@@ -515,17 +515,30 @@ static int reserve_contiguous_params(int ctlr, unsigned int id,
 {
 	int i, j;
 	unsigned int count = num_params;
+	int stop_param = start_param;
+	DECLARE_BITMAP(tmp_inuse, EDMA_MAX_PARAMENTRY);
 
 	for (i = start_param; i < edma_info[ctlr]->num_slots; ++i) {
 		j = EDMA_CHAN_SLOT(i);
-		if (!test_and_set_bit(j, edma_info[ctlr]->edma_inuse))
+		if (!test_and_set_bit(j, edma_info[ctlr]->edma_inuse)) {
+			/* Record our current beginning slot */
+			if (count == num_params)
+				stop_param = i;
+
 			count--;
+			set_bit(j, tmp_inuse);
+
 			if (count == 0)
 				break;
-		else if (id == EDMA_CONT_PARAMS_FIXED_EXACT)
-			break;
-		else
-			count = num_params;
+		} else {
+			clear_bit(j, tmp_inuse);
+
+			if (id == EDMA_CONT_PARAMS_FIXED_EXACT) {
+				stop_param = i;
+				break;
+			} else
+				count = num_params;
+		}
 	}
 
 	/*
@@ -534,12 +547,15 @@ static int reserve_contiguous_params(int ctlr, unsigned int id,
 	 * of contiguous parameter RAMs but do not find the exact number
 	 * requested as we may reach the total number of parameter RAMs
 	 */
-	if (count) {
-		for (j = i - num_params + count + 1; j <= i ; ++j)
+	if (i == edma_info[ctlr]->num_slots)
+		stop_param = i;
+
+	for (j = start_param; j < stop_param; j++)
+		if (test_bit(j, tmp_inuse))
 			clear_bit(j, edma_info[ctlr]->edma_inuse);
 
+	if (count)
 		return -EBUSY;
-	}
 
 	for (j = i - num_params + 1; j <= i; ++j)
 		memcpy_toio(edmacc_regs_base[ctlr] + PARM_OFFSET(j),