---

yaml --- r: 127103 b: refs/heads/master c: 8f1cc23 h: refs/heads/master i: 127101: fd5ecc8 127099: 0fde67e 127095: 128bdea 127087: 583e89c 127071: 8348683 127039: 47257d9 126975: 5a59775 v: v3
git-mirror · Jan 7, 2009 · 121e15f · 121e15f
1 parent 464d9e4
commit 121e15f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git 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
@@ -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;
 }