Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/sh/drivers/dma/dma-g2.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}

arch/sh/drivers/dma/dmabrg.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}