Re: [PATCH 2/8] media: rcar_vin: Use correct pad number in try_fmt

[Laurent Pinchart <laurent.pinchart@ideasonboard.com>]

Hello Niklas,

Thank you for the patch.

On Wednesday 25 May 2016 21:10:03 Niklas S�derlund wrote:
> From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
> 
> 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@codethink.co.uk>
> Reviewed-by: Rob Taylor <rob.taylor@codethink.co.uk>
> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> [uli: adapted to rcar-vin rewrite]
> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
> Signed-off-by: Niklas S�derlund <niklas.soderlund+renesas@ragnatech.se>
> ---
>  drivers/media/platform/rcar-vin/rcar-v4l2.c | 14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c
> b/drivers/media/platform/rcar-vin/rcar-v4l2.c index 929816b..3788f8a 100644
> --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
> +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
> @@ -98,7 +98,7 @@ static int __rvin_try_format_source(struct rvin_dev *vin,
>  					struct rvin_source_fmt *source)
>  {
>  	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,
>  	};
> @@ -108,10 +108,16 @@ static int __rvin_try_format_source(struct rvin_dev
> *vin,
> 
>  	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,
> -					 &pad_cfg, &format);
> +					 pad_cfg, &format);

pad_cfg is subdev-specific, you can't use v4l2_device_call_until_err(). You 
should use v4l2_subdev_call() instead. This will obviously not be enough if we 
have more than one subdev in the pipeline, but the code is broken in that case 
anyway.

>  	if (ret < 0)
> -		return ret;
> +		goto cleanup;
> 
>  	v4l2_fill_pix_format(pix, &format.format);
> 
> @@ -121,6 +127,8 @@ static int __rvin_try_format_source(struct rvin_dev
> *vin, vin_dbg(vin, "Source resolution: %ux%u\n", source->width,
>  		source->height);
> 
> +cleanup:

Nitpicking, I'd name the label "done".

> +	v4l2_subdev_free_pad_config(pad_cfg);
>  	return 0;
>  }

-- 
Regards,

Laurent Pinchart