diff options
| author | Julia Lawall <Julia.Lawall@lip6.fr> | 2012-03-15 15:14:43 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-03-15 15:14:43 +0900 |
| commit | 691c01c3f0b3252308162de90edcd02f7ca1733c (patch) | |
| tree | 4e38b3410d5d966a87787a96344b629d0065133a /arch/sh | |
| parent | f1cbd03f5eabb75ea8ace23b47d2209f10871c16 (diff) | |
| download | linux-3.10-691c01c3f0b3252308162de90edcd02f7ca1733c.tar.gz linux-3.10-691c01c3f0b3252308162de90edcd02f7ca1733c.tar.bz2 linux-3.10-691c01c3f0b3252308162de90edcd02f7ca1733c.zip | |
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: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/drivers/dma/dma-g2.c | 4 | ||||
| -rw-r--r-- | arch/sh/drivers/dma/dmabrg.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/drivers/dma/dma-g2.c b/arch/sh/drivers/dma/dma-g2.c index be9ca7ca0ce..e1ab6eb3c04 100644 --- a/arch/sh/drivers/dma/dma-g2.c +++ b/arch/sh/drivers/dma/dma-g2.c @@ -181,14 +181,14 @@ static int __init g2_dma_init(void) ret = register_dmac(&g2_dma_info); if (unlikely(ret != 0)) - free_irq(HW_EVENT_G2_DMA, 0); + free_irq(HW_EVENT_G2_DMA, &g2_dma_info); return ret; } 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); } diff --git a/arch/sh/drivers/dma/dmabrg.c b/arch/sh/drivers/dma/dmabrg.c index 3d66a32ce61..c0dd904483c 100644 --- a/arch/sh/drivers/dma/dmabrg.c +++ b/arch/sh/drivers/dma/dmabrg.c @@ -189,8 +189,8 @@ static int __init dmabrg_init(void) if (ret == 0) return ret; - free_irq(DMABRGI1, 0); -out1: free_irq(DMABRGI0, 0); + free_irq(DMABRGI1, NULL); +out1: free_irq(DMABRGI0, NULL); out0: kfree(dmabrg_handlers); return ret; } |