[media] coda: Call v4l2_device_unregister() from a single location

Instead of calling v4l2_device_unregister() in multiple locations within the
error paths, let's call it from a single location to make the error handling
simpler.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index c588fad0f1fda6ff9b8bd88eaf9d260503d3ea6b..1871f0502f4260fd3c6b784bc4f496a5d45a307a 100644 (file)
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -2035,12 +2035,14 @@ static int coda_probe(struct platform_device *pdev)
 
        pdev_id = of_id ? of_id->data : platform_get_device_id(pdev);
 
-       if (of_id)
+       if (of_id) {
                dev->devtype = of_id->data;
-       else if (pdev_id)
+       } else if (pdev_id) {
                dev->devtype = &coda_devdata[pdev_id->driver_data];
-       else
-               return -EINVAL;
+       } else {
+               ret = -EINVAL;
+               goto err_v4l2_register;
+       }
 
        spin_lock_init(&dev->irqlock);
        INIT_LIST_HEAD(&dev->instances);
@@ -2120,8 +2122,7 @@ static int coda_probe(struct platform_device *pdev)
                                         dev->debugfs_root);
                if (ret < 0) {
                        dev_err(&pdev->dev, "failed to allocate work buffer\n");
-                       v4l2_device_unregister(&dev->v4l2_dev);
-                       return ret;
+                       goto err_v4l2_register;
                }
        }
 
@@ -2131,8 +2132,7 @@ static int coda_probe(struct platform_device *pdev)
                                         dev->debugfs_root);
                if (ret < 0) {
                        dev_err(&pdev->dev, "failed to allocate temp buffer\n");
-                       v4l2_device_unregister(&dev->v4l2_dev);
-                       return ret;
+                       goto err_v4l2_register;
                }
        }
 
@@ -2167,6 +2167,10 @@ static int coda_probe(struct platform_device *pdev)
        pm_runtime_enable(&pdev->dev);
 
        return coda_firmware_request(dev);
+
+err_v4l2_register:
+       v4l2_device_unregister(&dev->v4l2_dev);
+       return ret;
 }
 
 static int coda_remove(struct platform_device *pdev)