Commit 181905e0 authored by Ulrich Hecht's avatar Ulrich Hecht Committed by Mauro Carvalho Chehab

[media] media: rcar_vin: Use correct pad number in try_fmt

Fix rcar_vin_try_fmt's use of an inappropriate pad number when calling
the subdev set_fmt function - for the ADV7612, IDs should be non-zero.
Signed-off-by: default avatarWilliam Towle <william.towle@codethink.co.uk>
Reviewed-by: default avatarRob Taylor <rob.taylor@codethink.co.uk>
[ulrich.hecht+renesas@gmail.com: adapted to rcar-vin rewrite]
Signed-off-by: default avatarUlrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent fa037403
...@@ -98,7 +98,7 @@ static int __rvin_try_format_source(struct rvin_dev *vin, ...@@ -98,7 +98,7 @@ static int __rvin_try_format_source(struct rvin_dev *vin,
struct rvin_source_fmt *source) struct rvin_source_fmt *source)
{ {
struct v4l2_subdev *sd; struct v4l2_subdev *sd;
struct v4l2_subdev_pad_config pad_cfg; struct v4l2_subdev_pad_config *pad_cfg;
struct v4l2_subdev_format format = { struct v4l2_subdev_format format = {
.which = which, .which = which,
}; };
...@@ -108,10 +108,16 @@ static int __rvin_try_format_source(struct rvin_dev *vin, ...@@ -108,10 +108,16 @@ static int __rvin_try_format_source(struct rvin_dev *vin,
v4l2_fill_mbus_format(&format.format, pix, vin->source.code); v4l2_fill_mbus_format(&format.format, pix, vin->source.code);
pad_cfg = v4l2_subdev_alloc_pad_config(sd);
if (pad_cfg == NULL)
return -ENOMEM;
format.pad = vin->src_pad_idx;
ret = v4l2_device_call_until_err(sd->v4l2_dev, 0, pad, set_fmt, ret = v4l2_device_call_until_err(sd->v4l2_dev, 0, pad, set_fmt,
&pad_cfg, &format); pad_cfg, &format);
if (ret < 0) if (ret < 0)
return ret; goto cleanup;
v4l2_fill_pix_format(pix, &format.format); v4l2_fill_pix_format(pix, &format.format);
...@@ -121,6 +127,8 @@ static int __rvin_try_format_source(struct rvin_dev *vin, ...@@ -121,6 +127,8 @@ static int __rvin_try_format_source(struct rvin_dev *vin,
vin_dbg(vin, "Source resolution: %ux%u\n", source->width, vin_dbg(vin, "Source resolution: %ux%u\n", source->width,
source->height); source->height);
cleanup:
v4l2_subdev_free_pad_config(pad_cfg);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment