From 3c888bad39b059c263fb1d1737f016979ce44ff4 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier.adi@gmail.com>
Date: Wed, 7 Jan 2009 23:14:39 +0800
Subject: [PATCH] --- yaml --- r: 127107 b: refs/heads/master c:
 596b565bd10167bc6820aa09c1d3233b23743615 h: refs/heads/master i:   127105:
 d0633fa42ce6ea470a78234375146ae119bd6009   127103:
 121e15f5c92e6e7f6fd8a1b59f73ce351b89005a v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/blackfin/kernel/bfin_dma_5xx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2454ee1ab611..10987b0c4e90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ab729d82f1fa1f7d9896be1bd689ee2a1f17860
+refs/heads/master: 596b565bd10167bc6820aa09c1d3233b23743615
diff --git a/trunk/arch/blackfin/kernel/bfin_dma_5xx.c b/trunk/arch/blackfin/kernel/bfin_dma_5xx.c
index 917b5b8e32c8..9c36b2d172d0 100644
--- a/trunk/arch/blackfin/kernel/bfin_dma_5xx.c
+++ b/trunk/arch/blackfin/kernel/bfin_dma_5xx.c
@@ -135,7 +135,7 @@ int request_dma(unsigned int channel, const char *device_id)
 	 * descriptor/channel
 	 */
 	pr_debug("request_dma() : END  \n");
-	return channel;
+	return 0;
 }
 EXPORT_SYMBOL(request_dma);