Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7bd660a authored by Fabio Estevam's avatar Fabio Estevam Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarFabio Estevam <fabio.estevam@freescale.com>
Acked-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent ed3da2bf

drivers/media/platform/coda/coda-common.c

+12 −8
Original line number Diff line number Diff line
@@ -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)