Commit 691c01c3 authored by Julia Lawall's avatar Julia Lawall Committed by Paul Mundt

arch/sh/drivers/dma/{dma-g2,dmabrg}.c: ensure arguments to request_irq and free_irq are compatible

Convert calls to free_irq so that the second argument is the same as the
last argument of the corresponding call to request_irq.  Without this
property, free_irq does nothing.

In the case of dmabrg.c the change is merely cosmetic - changing 0 to NULL.
Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent f1cbd03f
...@@ -181,14 +181,14 @@ static int __init g2_dma_init(void) ...@@ -181,14 +181,14 @@ static int __init g2_dma_init(void)
ret = register_dmac(&g2_dma_info); ret = register_dmac(&g2_dma_info);
if (unlikely(ret != 0)) if (unlikely(ret != 0))
free_irq(HW_EVENT_G2_DMA, 0); free_irq(HW_EVENT_G2_DMA, &g2_dma_info);
return ret; return ret;
} }
static void __exit g2_dma_exit(void) static void __exit g2_dma_exit(void)
{ {
free_irq(HW_EVENT_G2_DMA, 0); free_irq(HW_EVENT_G2_DMA, &g2_dma_info);
unregister_dmac(&g2_dma_info); unregister_dmac(&g2_dma_info);
} }
......
...@@ -189,8 +189,8 @@ static int __init dmabrg_init(void) ...@@ -189,8 +189,8 @@ static int __init dmabrg_init(void)
if (ret == 0) if (ret == 0)
return ret; return ret;
free_irq(DMABRGI1, 0); free_irq(DMABRGI1, NULL);
out1: free_irq(DMABRGI0, 0); out1: free_irq(DMABRGI0, NULL);
out0: kfree(dmabrg_handlers); out0: kfree(dmabrg_handlers);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment