Title: [7863] trunk/arch/blackfin/kernel/bfin_dma_5xx.c: blackfin dma: do not let people call with NULL callback
- Revision
- 7863
- Author
- vapier
- Date
- 2009-11-24 13:36:36 -0500 (Tue, 24 Nov 2009)
Log Message
blackfin dma: do not let people call with NULL callback
Modified Paths
Diff
Modified: trunk/arch/blackfin/kernel/bfin_dma_5xx.c (7862 => 7863)
--- trunk/arch/blackfin/kernel/bfin_dma_5xx.c 2009-11-24 14:59:10 UTC (rev 7862)
+++ trunk/arch/blackfin/kernel/bfin_dma_5xx.c 2009-11-24 18:36:36 UTC (rev 7863)
@@ -138,21 +138,20 @@
int set_dma_callback(unsigned int channel, irq_handler_t callback, void *data)
{
- BUG_ON(channel >= MAX_DMA_CHANNELS ||
+ int ret;
+ unsigned int irq;
+
+ BUG_ON(channel >= MAX_DMA_CHANNELS || !callback ||
!atomic_read(&dma_ch[channel].chan_status));
- if (callback != NULL) {
- int ret;
- unsigned int irq = channel2irq(channel);
+ irq = channel2irq(channel);
+ ret = request_irq(irq, callback, 0, dma_ch[channel].device_id, data);
+ if (ret)
+ return ret;
- 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 = ""
- dma_ch[channel].irq = irq;
- dma_ch[channel].data = ""
- }
return 0;
}
EXPORT_SYMBOL(set_dma_callback);
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
