Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303141
b: refs/heads/master
c: 98e3b33
h: refs/heads/master
i:
  303139: 1cb9512
v: v3
  • Loading branch information
Akinobu Mita authored and Sekhar Nori committed May 9, 2012
1 parent 4f6271d commit c457454
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 59858b718efe12a7dbba72a158ea2edfc516b216
refs/heads/master: 98e3b3393ff25f79399dd7cdcf6450788788acae
6 changes: 3 additions & 3 deletions trunk/arch/arm/mach-davinci/dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit c457454

Please sign in to comment.