diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2016-02-26 08:21:35 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-20 15:45:21 +0900 |
| commit | 3ae078af8cbeacf66194b7b3bdd31911f11bde4e (patch) | |
| tree | bfdfe78439770ed488a97e3bebf50105ec11c557 | |
| parent | 87a952d621b2597314220ba5a90db86aae8a6a11 (diff) | |
| download | lwn-3ae078af8cbeacf66194b7b3bdd31911f11bde4e.tar.gz lwn-3ae078af8cbeacf66194b7b3bdd31911f11bde4e.zip | |
coda: fix error path in case of missing pdata on non-DT platform
commit bc717d5e92c8c079280eb4acbe335c6f25041aa2 upstream.
If we bail out this early, v4l2_device_register() has not been called
yet, so no need to call v4l2_device_unregister().
Fixes: b7bd660a51f0 ("[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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/media/platform/coda/coda-common.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c index 2d782ce94a67..7ae89c684783 100644 --- a/drivers/media/platform/coda/coda-common.c +++ b/drivers/media/platform/coda/coda-common.c @@ -2118,14 +2118,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); |