[media] sir_ir: attempt to free already free_irq

If the probe fails (e.g. port already in use), rmmod causes null deref.

Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/rc/sir_ir.c b/drivers/media/rc/sir_ir.c
index 90a5f8fd5eea68d6e1f007843c6bb67f7c8790b2..c27d6b406d7ceba0e3a270172d06970998b5a2c2 100644 (file)
--- a/drivers/media/rc/sir_ir.c
+++ b/drivers/media/rc/sir_ir.c
@@ -381,6 +381,8 @@ static int sir_ir_probe(struct platform_device *dev)
 
 static int sir_ir_remove(struct platform_device *dev)
 {
+       drop_hardware();
+       drop_port();
        return 0;
 }
 
@@ -421,8 +423,6 @@ pdev_alloc_fail:
 
 static void __exit sir_ir_exit(void)
 {
-       drop_hardware();
-       drop_port();
        platform_device_unregister(sir_ir_dev);
        platform_driver_unregister(&sir_ir_driver);
 }