davinci: Correct return value of edma_alloc_channel api
authorSudhakar Rajashekhara <sudhakar.raj@ti.com>
Wed, 6 Jan 2010 11:58:36 +0000 (17:28 +0530)
committerKevin Hilman <khilman@deeprootsystems.com>
Thu, 4 Feb 2010 21:30:00 +0000 (13:30 -0800)
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>
arch/arm/mach-davinci/dma.c

index 648fbb760ae1d63c74e700eae260629046add8b1..5a71f4d1c5c5395b9f790b0e78b263cadd13da49 100644 (file)
@@ -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);