Commit bc717d5e authored Feb 26, 2016 by Philipp Zabel Committed by Mauro Carvalho Chehab Mar 03, 2016

[media] coda: fix error path in case of missing pdata on non-DT platform



If we bail out this early, v4l2_device_register() has not been called
yet, so no need to call v4l2_device_unregister().

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

Reported-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

parent 31e717db

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

+4 −6

Original line number	Diff line number	Diff line
		@@ -2178,14 +2178,12 @@ 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 {
		ret = -EINVAL;
		goto err_v4l2_register;
		}
		else
		return -EINVAL;

		spin_lock_init(&dev->irqlock);
		INIT_LIST_HEAD(&dev->instances);