[PATCH v2 4/9] media: rcar_vin: Use correct pad number in try_fmt

[Ulrich Hecht]

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.to...@codethink.co.uk>
Reviewed-by: Rob Taylor <rob.tay...@codethink.co.uk>
Acked-by: Hans Verkuil <hans.verk...@cisco.com>
[uli: adapted to rcar-vin rewrite]
Signed-off-by: Ulrich Hecht <ulrich.hecht+rene...@gmail.com>
---
 drivers/media/platform/rcar-vin/rcar-dma.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c 
b/drivers/media/platform/rcar-vin/rcar-dma.c
index c267309..15a67f7 100644
--- a/drivers/media/platform/rcar-vin/rcar-dma.c
+++ b/drivers/media/platform/rcar-vin/rcar-dma.c
@@ -329,7 +329,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,
        };
@@ -337,12 +337,18 @@ 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;
+
        v4l2_fill_mbus_format(&format.format, pix, vin->sensor.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);
 
@@ -351,6 +357,8 @@ static int __rvin_dma_try_format_sensor(struct rvin_dev 
*vin,
 
        vin_dbg(vin, "Sensor format: %ux%u\n", sensor->width, sensor->height);
 
+cleanup:
+       v4l2_subdev_free_pad_config(pad_cfg);
        return 0;
 }
 
-- 
2.6.4