diff options
| author | Sudhakar Rajashekhara <sudhakar.raj@ti.com> | 2010-01-06 17:28:36 +0530 |
|---|---|---|
| committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-02-04 13:30:00 -0800 |
| commit | 0e6cb8d296308a75e4047fabc752731ff7836182 (patch) | |
| tree | 837cebf1cbe0ce6708b79b250b4d17c05e5c9d11 | |
| parent | 77a92c710b65864fe07491864f3bbac9fbac51bc (diff) | |
| download | kernel_samsung_aries-0e6cb8d296308a75e4047fabc752731ff7836182.zip kernel_samsung_aries-0e6cb8d296308a75e4047fabc752731ff7836182.tar.gz kernel_samsung_aries-0e6cb8d296308a75e4047fabc752731ff7836182.tar.bz2 | |
davinci: Correct return value of edma_alloc_channel api
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>
| -rw-r--r-- | arch/arm/mach-davinci/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/mach-davinci/dma.c index 648fbb7..5a71f4d 100644 --- a/arch/arm/mach-davinci/dma.c +++ b/arch/arm/mach-davinci/dma.c @@ -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); |