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);