On 06/03/2015 03:59 PM, William Towle wrote:
> From: Rob Taylor <rob.taylor@xxxxxxxxxxxxxxx>
>
> Fix calls to subdev try_fmt to use correct pad. Fixes failures with
> subdevs that care about having the right pad number set.
>
> Signed-off-by: William Towle <william.towle@xxxxxxxxxxxxxxx>
> Reviewed-by: Rob Taylor <rob.taylor@xxxxxxxxxxxxxxx>
> ---
> drivers/media/platform/soc_camera/soc_scale_crop.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/drivers/media/platform/soc_camera/soc_scale_crop.c b/drivers/media/platform/soc_camera/soc_scale_crop.c
> index bda29bc..90e2769 100644
> --- a/drivers/media/platform/soc_camera/soc_scale_crop.c
> +++ b/drivers/media/platform/soc_camera/soc_scale_crop.c
> @@ -225,6 +225,10 @@ static int client_set_fmt(struct soc_camera_device *icd,
> bool host_1to1;
> int ret;
>
> +#if defined(CONFIG_MEDIA_CONTROLLER)
> + format->pad = icd->src_pad_idx;
> +#endif
As mentioned in the review of patch 9 it should be possible to drop the
#if defined() here.
> +
> ret = v4l2_device_call_until_err(sd->v4l2_dev,
> soc_camera_grp_id(icd), pad,
> set_fmt, NULL, format);
> @@ -261,10 +265,16 @@ static int client_set_fmt(struct soc_camera_device *icd,
> /* width <= max_width && height <= max_height - guaranteed by try_fmt */
> while ((width > tmp_w || height > tmp_h) &&
> tmp_w < max_width && tmp_h < max_height) {
> +
Spurious whitespace change.
> tmp_w = min(2 * tmp_w, max_width);
> tmp_h = min(2 * tmp_h, max_height);
> mf->width = tmp_w;
> mf->height = tmp_h;
> +
> +#if defined(CONFIG_MEDIA_CONTROLLER)
> + format->pad = icd->src_pad_idx;
> +#endif
Same as the first comment.
> +
> ret = v4l2_device_call_until_err(sd->v4l2_dev,
> soc_camera_grp_id(icd), pad,
> set_fmt, NULL, format);
>
Regards,
Hans
--
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
