From c45745451a9bb4879ff82f75bb143f386905977e Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Wed, 11 Apr 2012 20:36:53 +0900 Subject: [PATCH] --- yaml --- r: 303141 b: refs/heads/master c: 98e3b3393ff25f79399dd7cdcf6450788788acae h: refs/heads/master i: 303139: 1cb95125679a2b3e9a8bb28071c032068080adf3 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-davinci/dma.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 390c8f3103e0..36411c6fd9d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59858b718efe12a7dbba72a158ea2edfc516b216 +refs/heads/master: 98e3b3393ff25f79399dd7cdcf6450788788acae diff --git a/trunk/arch/arm/mach-davinci/dma.c b/trunk/arch/arm/mach-davinci/dma.c index fd33919c95d4..95ce019c9b98 100644 --- a/trunk/arch/arm/mach-davinci/dma.c +++ b/trunk/arch/arm/mach-davinci/dma.c @@ -557,9 +557,9 @@ static int reserve_contiguous_slots(int ctlr, unsigned int id, if (i == edma_cc[ctlr]->num_slots) stop_slot = i; - for (j = start_slot; j < stop_slot; j++) - if (test_bit(j, tmp_inuse)) - clear_bit(j, edma_cc[ctlr]->edma_inuse); + j = start_slot; + for_each_set_bit_from(j, tmp_inuse, stop_slot) + clear_bit(j, edma_cc[ctlr]->edma_inuse); if (count) return -EBUSY;