diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2012-03-15 02:14:43 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-03-15 02:14:43 -0400 |
commit | 691c01c3f0b3252308162de90edcd02f7ca1733c (patch) | |
tree | 4e38b3410d5d966a87787a96344b629d0065133a /arch/sh | |
parent | f1cbd03f5eabb75ea8ace23b47d2209f10871c16 (diff) |
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 be9ca7ca0ce4..e1ab6eb3c04b 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) | |||
181 | 181 | ||
182 | ret = register_dmac(&g2_dma_info); | 182 | ret = register_dmac(&g2_dma_info); |
183 | if (unlikely(ret != 0)) | 183 | if (unlikely(ret != 0)) |
184 | free_irq(HW_EVENT_G2_DMA, 0); | 184 | free_irq(HW_EVENT_G2_DMA, &g2_dma_info); |
185 | 185 | ||
186 | return ret; | 186 | return ret; |
187 | } | 187 | } |
188 | 188 | ||
189 | static void __exit g2_dma_exit(void) | 189 | static void __exit g2_dma_exit(void) |
190 | { | 190 | { |
191 | free_irq(HW_EVENT_G2_DMA, 0); | 191 | free_irq(HW_EVENT_G2_DMA, &g2_dma_info); |
192 | unregister_dmac(&g2_dma_info); | 192 | unregister_dmac(&g2_dma_info); |
193 | } | 193 | } |
194 | 194 | ||
diff --git a/arch/sh/drivers/dma/dmabrg.c b/arch/sh/drivers/dma/dmabrg.c index 3d66a32ce610..c0dd904483c7 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) | |||
189 | if (ret == 0) | 189 | if (ret == 0) |
190 | return ret; | 190 | return ret; |
191 | 191 | ||
192 | free_irq(DMABRGI1, 0); | 192 | free_irq(DMABRGI1, NULL); |
193 | out1: free_irq(DMABRGI0, 0); | 193 | out1: free_irq(DMABRGI0, NULL); |
194 | out0: kfree(dmabrg_handlers); | 194 | out0: kfree(dmabrg_handlers); |
195 | return ret; | 195 | return ret; |
196 | } | 196 | } |