[media] rc: Fix invalid free_region and/or free_irq on probe failure

fintek-cir, ite-cir and nuvoton-cir may try to free an I/O region
and/or IRQ handler that was never allocated after a failure in their
respective probe functions.  Add and use separate labels on the
failure path so they will do the right cleanup after each possible
point of failure.

Compile-tested only.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
index 0e49c99abf68..36fe5a349b95 100644
--- a/drivers/media/rc/ite-cir.c
+++ b/drivers/media/rc/ite-cir.c
@@ -1598,24 +1598,22 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
 
         if (request_irq(itdev->cir_irq, ite_cir_isr, IRQF_SHARED,
                         ITE_DRIVER_NAME, (void *)itdev))
-                goto failure;
+                goto failure2;
 
         ret = rc_register_device(rdev);
         if (ret)
-                goto failure;
+                goto failure3;
 
         itdev->rdev = rdev;
         ite_pr(KERN_NOTICE, "driver has been successfully loaded\n");
 
         return 0;
 
+failure3:
+        free_irq(itdev->cir_irq, itdev);
+failure2:
+        release_region(itdev->cir_addr, itdev->params.io_region_size);
 failure:
-        if (itdev->cir_irq)
-                free_irq(itdev->cir_irq, itdev);
-
-        if (itdev->cir_addr)
-                release_region(itdev->cir_addr, itdev->params.io_region_size);
-
         rc_free_device(rdev);
         kfree(itdev);