summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Martinez Canillas2016-02-05 20:09:53 +0100
committerMauro Carvalho Chehab2016-02-10 12:38:20 +0100
commit2bd5e4375aec8731c9818b2ac86ac035d3aebe86 (patch)
treedbbc85534c1f174f694438f2bc540a5278c32776
parent[media] v4l2-async: call registered_async after subdev registration (diff)
downloadkernel-qcow2-linux-2bd5e4375aec8731c9818b2ac86ac035d3aebe86.tar.gz
kernel-qcow2-linux-2bd5e4375aec8731c9818b2ac86ac035d3aebe86.tar.xz
kernel-qcow2-linux-2bd5e4375aec8731c9818b2ac86ac035d3aebe86.zip
[media] tvp5150: put endpoint node on error
If the parallel mbus configuration is not correct, the endpoint device node isn't currently put again in the error path. Fix it. Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/i2c/tvp5150.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c
index 19b52736b24e..c7eeb59a999b 100644
--- a/drivers/media/i2c/tvp5150.c
+++ b/drivers/media/i2c/tvp5150.c
@@ -1268,8 +1268,10 @@ static int tvp5150_parse_dt(struct tvp5150 *decoder, struct device_node *np)
if (bus_cfg.bus_type == V4L2_MBUS_PARALLEL &&
!(flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH &&
flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH &&
- flags & V4L2_MBUS_FIELD_EVEN_LOW))
- return -EINVAL;
+ flags & V4L2_MBUS_FIELD_EVEN_LOW)) {
+ ret = -EINVAL;
+ goto err;
+ }
decoder->mbus_type = bus_cfg.bus_type;