| From 80ccf4ad06dc9d2f06a8347b2d309cdc959f72b3 Mon Sep 17 00:00:00 2001 |
| From: Sifan Naeem <sifan.naeem@imgtec.com> |
| Date: Tue, 10 Feb 2015 07:41:56 -0300 |
| Subject: [media] rc: img-ir: fix error in parameters passed to irq_free() |
| |
| From: Sifan Naeem <sifan.naeem@imgtec.com> |
| |
| commit 80ccf4ad06dc9d2f06a8347b2d309cdc959f72b3 upstream. |
| |
| img_ir_remove() passes a pointer to the ISR function as the 2nd |
| parameter to irq_free() instead of a pointer to the device data |
| structure. |
| This issue causes unloading img-ir module to fail with the below |
| warning after building and loading img-ir as a module. |
| |
| WARNING: CPU: 2 PID: 155 at ../kernel/irq/manage.c:1278 |
| __free_irq+0xb4/0x214() Trying to free already-free IRQ 58 |
| Modules linked in: img_ir(-) |
| CPU: 2 PID: 155 Comm: rmmod Not tainted 3.14.0 #55 ... |
| Call Trace: |
| ... |
| [<8048d420>] __free_irq+0xb4/0x214 |
| [<8048d6b4>] free_irq+0xac/0xf4 |
| [<c009b130>] img_ir_remove+0x54/0xd4 [img_ir] [<8073ded0>] |
| platform_drv_remove+0x30/0x54 ... |
| |
| Fixes: 160a8f8aec4d ("[media] rc: img-ir: add base driver") |
| |
| Signed-off-by: Sifan Naeem <sifan.naeem@imgtec.com> |
| Acked-by: James Hogan <james.hogan@imgtec.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/media/rc/img-ir/img-ir-core.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/media/rc/img-ir/img-ir-core.c |
| +++ b/drivers/media/rc/img-ir/img-ir-core.c |
| @@ -146,7 +146,7 @@ static int img_ir_remove(struct platform |
| { |
| struct img_ir_priv *priv = platform_get_drvdata(pdev); |
| |
| - free_irq(priv->irq, img_ir_isr); |
| + free_irq(priv->irq, priv); |
| img_ir_remove_hw(priv); |
| img_ir_remove_raw(priv); |
| |
