提交 bc717d5e 编写于 作者: P Philipp Zabel 提交者: Mauro Carvalho Chehab

[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: NMichael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: NPhilipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: NFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: NMauro Carvalho Chehab <mchehab@osg.samsung.com>
上级 31e717db
......@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册