From 121e15f5c92e6e7f6fd8a1b59f73ce351b89005a 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: 127103 b: refs/heads/master c:
 8f1cc233881cd5335327ef84baa6ba1c83b379b4 h: refs/heads/master i:   127101:
 fd5ecc87a146ddf4e3cde2734cf05c574e350db6   127099:
 0fde67eef6beaa7f69984bea6c7b78bd99952cd1   127095:
 128bdeae44e9307ed0ba602b685c323d32e57550   127087:
 583e89c074aee23885ae5b2faa1f7c6bdfc12b1f   127071:
 83486833a4188e9e90cf33d6bb8292825e542627   127039:
 47257d9ea094e664d9d8d7ff748e7bf29dbb72a7   126975:
 5a5977599e8e4f8e2f284d41f6ae11c492c8faff v: v3

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

diff --git a/[refs] b/[refs]
index 08568a354e1b..89d3956ed0ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b011407d653b92191aa4993222523039d44af52
+refs/heads/master: 8f1cc233881cd5335327ef84baa6ba1c83b379b4
diff --git a/trunk/arch/blackfin/kernel/bfin_dma_5xx.c b/trunk/arch/blackfin/kernel/bfin_dma_5xx.c
index bdebab41419f..ed7d2859a626 100644
--- a/trunk/arch/blackfin/kernel/bfin_dma_5xx.c
+++ b/trunk/arch/blackfin/kernel/bfin_dma_5xx.c
@@ -157,18 +157,16 @@ int set_dma_callback(unsigned int channel, irq_handler_t callback, void *data)
 	       && channel < MAX_DMA_CHANNELS));
 
 	if (callback != NULL) {
-		int ret_val;
-		dma_ch[channel].irq = channel2irq(channel);
-		dma_ch[channel].data = data;
+		int ret;
+		unsigned int irq = channel2irq(channel);
 
-		ret_val =
-		    request_irq(dma_ch[channel].irq, callback, IRQF_DISABLED,
-				dma_ch[channel].device_id, data);
-		if (ret_val) {
-			printk(KERN_NOTICE
-			       "Request irq in DMA engine failed.\n");
-			return -EPERM;
-		}
+		ret = request_irq(irq, callback, IRQF_DISABLED,
+			dma_ch[channel].device_id, data);
+		if (ret)
+			return ret;
+
+		dma_ch[channel].irq = irq;
+		dma_ch[channel].data = data;
 	}
 	return 0;
 }