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: William Towle <william.towle@xxxxxxxxxxxxxxx>
Reviewed-by: Rob Taylor <rob.taylor@xxxxxxxxxxxxxxx>
Acked-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
[uli: adapted to rcar-vin rewrite]
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@xxxxxxxxx>
---
drivers/media/platform/rcar-vin/rcar-dma.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c b/drivers/media/platform/rcar-vin/rcar-dma.c
index c667ce5..70dc928 100644
--- a/drivers/media/platform/rcar-vin/rcar-dma.c
+++ b/drivers/media/platform/rcar-vin/rcar-dma.c
@@ -294,7 +294,7 @@ static int __rvin_dma_try_format_sensor(struct rvin_dev *vin,
struct rvin_sensor *sensor)
{
struct v4l2_subdev *sd;
- struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_pad_config *pad_cfg;
struct v4l2_subdev_format format = {
.which = which,
};
@@ -303,15 +303,20 @@ static int __rvin_dma_try_format_sensor(struct rvin_dev *vin,
sd = vin_to_sd(vin);
+ pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ if (pad_cfg == NULL)
+ return -ENOMEM;
+
/* Requested */
rwidth = pix->width;
rheight = pix->height;
v4l2_fill_mbus_format(&format.format, pix, info->code);
+ format.pad = vin->src_pad_idx;
ret = v4l2_device_call_until_err(sd->v4l2_dev, 0, pad, set_fmt,
- &pad_cfg, &format);
+ pad_cfg, &format);
if (ret < 0)
- return ret;
+ goto cleanup;
v4l2_fill_pix_format(pix, &format.format);
/* Sensor */
@@ -325,7 +330,7 @@ static int __rvin_dma_try_format_sensor(struct rvin_dev *vin,
vin_dbg(vin, "sensor format mismatch, see if we can scale\n");
ret = rvin_scale_try(vin, pix, rwidth, rheight);
if (ret)
- return ret;
+ goto cleanup;
}
/* Store sensor output format */
@@ -334,6 +339,8 @@ static int __rvin_dma_try_format_sensor(struct rvin_dev *vin,
sensor->height = sheight;
}
+cleanup:
+ v4l2_subdev_free_pad_config(pad_cfg);
return 0;
}
--
2.6.4
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
