Skip to content

Commit

Permalink
davinci: Correct return value of edma_alloc_channel api
Browse files Browse the repository at this point in the history
Currently, edma_alloc_channel api is returning the channel
number without prepending the controller on which the
channel was allocated. So, if a channel is allocated on
2nd controller, calls subsequent to edma_alloc_channel would
never know that channel was allocated on the 2nd controller,
and continue to operate on 1st controller, resulting in edma
failure. This patch fixes this issue.

Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
  • Loading branch information
Sudhakar Rajashekhara authored and Kevin Hilman committed Feb 4, 2010
1 parent 77a92c7 commit 0e6cb8d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/mach-davinci/dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ int edma_alloc_channel(int channel,

map_dmach_queue(ctlr, channel, eventq_no);

return channel;
return EDMA_CTLR_CHAN(ctlr, channel);
}
EXPORT_SYMBOL(edma_alloc_channel);

Expand Down

0 comments on commit 0e6cb8d

Please sign in to comment.