1 files changed, 13 insertions, 13 deletions

diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
index 1b8669b6d042..dd8237324c09 100644
--- a/drivers/media/rc/ite-cir.c
+++ b/drivers/media/rc/ite-cir.c
@@ -1472,7 +1472,7 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
         /* input device for IR remote (and tx) */
         rdev = rc_allocate_device();
         if (!rdev)
-                goto failure;
+                goto exit_free_dev_rdev;
         itdev->rdev = rdev;
 
         ret = -ENODEV;
@@ -1498,12 +1498,12 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
         if (!pnp_port_valid(pdev, io_rsrc_no) ||
             pnp_port_len(pdev, io_rsrc_no) != dev_desc->io_region_size) {
                 dev_err(&pdev->dev, "IR PNP Port not valid!\n");
-                goto failure;
+                goto exit_free_dev_rdev;
         }
 
         if (!pnp_irq_valid(pdev, 0)) {
                 dev_err(&pdev->dev, "PNP IRQ not valid!\n");
-                goto failure;
+                goto exit_free_dev_rdev;
         }
 
         /* store resource values */
@@ -1591,29 +1591,29 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
         rdev->driver_name = ITE_DRIVER_NAME;
         rdev->map_name = RC_MAP_RC6_MCE;
 
+        ret = rc_register_device(rdev);
+        if (ret)
+                goto exit_free_dev_rdev;
+
         ret = -EBUSY;
         /* now claim resources */
         if (!request_region(itdev->cir_addr,
                                 dev_desc->io_region_size, ITE_DRIVER_NAME))
-                goto failure;
+                goto exit_unregister_device;
 
         if (request_irq(itdev->cir_irq, ite_cir_isr, IRQF_SHARED,
                         ITE_DRIVER_NAME, (void *)itdev))
-                goto failure2;
-
-        ret = rc_register_device(rdev);
-        if (ret)
-                goto failure3;
+                goto exit_release_cir_addr;
 
         ite_pr(KERN_NOTICE, "driver has been successfully loaded\n");
 
         return 0;
 
-failure3:
-        free_irq(itdev->cir_irq, itdev);
-failure2:
+exit_release_cir_addr:
         release_region(itdev->cir_addr, itdev->params.io_region_size);
-failure:
+exit_unregister_device:
+        rc_unregister_device(rdev);
+exit_free_dev_rdev:
         rc_free_device(rdev);
         kfree(itdev);