From: Ben Dooks <ben-linux@fluff.org>
Date: Mon, 28 Jan 2008 12:01:27 +0000 (+0100)
Subject: [ARM] 4787/1: S3C24XX: s3c2410_dma_request() should return the allocated channel... 
X-Git-Tag: v2.6.25-rc1~1175^2~2^9~8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a07c438faf952643f79983fb16a10f111c9df0df;p=linux-2.6

[ARM] 4787/1: S3C24XX: s3c2410_dma_request() should return the allocated channel number

The s3c2410_dma_request() function should return the channel allocated
instead of zero for success.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
index 68ce89db17..9785983dfb 100644
--- a/arch/arm/plat-s3c24xx/dma.c
+++ b/arch/arm/plat-s3c24xx/dma.c
@@ -787,7 +787,7 @@ int s3c2410_dma_request(unsigned int channel,
 
 	pr_debug("%s: channel initialised, %p\n", __FUNCTION__, chan);
 
-	return 0;
+	return chan->number | DMACH_LOW_LEVEL;
 }
 
 EXPORT_SYMBOL(s3c2410_dma_request);