[PATCH 08/13] media: rcar_vin: Use correct pad number in try_fmt

[William Towle]

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 
Reviewed-by: Rob Taylor 
---
 drivers/media/platform/soc_camera/rcar_vin.c |   17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/drivers/media/platform/soc_camera/rcar_vin.c 
b/drivers/media/platform/soc_camera/rcar_vin.c
index 00c1034..dab729a 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -1697,7 +1697,7 @@ static int rcar_vin_try_fmt(struct soc_camera_device *icd,
const struct soc_camera_format_xlate *xlate;
struct v4l2_pix_format *pix = &f->fmt.pix;
struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
-   struct v4l2_subdev_pad_config pad_cfg;
+   struct v4l2_subdev_pad_config *pad_cfg;
struct v4l2_subdev_format format = {
.which = V4L2_SUBDEV_FORMAT_TRY,
};
@@ -1706,6 +1706,10 @@ static int rcar_vin_try_fmt(struct soc_camera_device 
*icd,
int width, height;
int ret;
 
+   pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+   if (pad_cfg == NULL)
+   return -ENOMEM;
+
xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
if (!xlate) {
xlate = icd->current_fmt;
@@ -1734,10 +1738,11 @@ static int rcar_vin_try_fmt(struct soc_camera_device 
*icd,
mf->code = xlate->code;
mf->colorspace = pix->colorspace;
 
+   format.pad = icd->src_pad_idx;
ret = v4l2_device_call_until_err(sd->v4l2_dev, soc_camera_grp_id(icd),
-pad, set_fmt, &pad_cfg, &format);
+pad, set_fmt, pad_cfg, &format);
if (ret < 0)
-   return ret;
+   goto cleanup;
 
/* Adjust only if VIN cannot scale */
if (pix->width > mf->width * 2)
@@ -1761,12 +1766,12 @@ static int rcar_vin_try_fmt(struct soc_camera_device 
*icd,
mf->height = VIN_MAX_HEIGHT;
ret = v4l2_device_call_until_err(sd->v4l2_dev,
 soc_camera_grp_id(icd),
-pad, set_fmt, &pad_cfg,
+pad, set_fmt, pad_cfg,
 &format);
if (ret < 0) {
dev_err(icd->parent,
"client try_fmt() = %d\n", ret);
-   return ret;
+   goto cleanup;
}
}
/* We will scale exactly */
@@ -1776,6 +1781,8 @@ static int rcar_vin_try_fmt(struct soc_camera_device *icd,
pix->height = height;
}
 
+cleanup:
+   v4l2_subdev_free_pad_config(pad_cfg);
return ret;
 }
 
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 08/13] media: rcar_vin: Use correct pad number in try_fmt

[Hans Verkuil]

On 07/23/2015 02:21 PM, William Towle wrote:
> 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 
> Reviewed-by: Rob Taylor 

Acked-by: Hans Verkuil 

Regards,

Hans

> ---
>  drivers/media/platform/soc_camera/rcar_vin.c |   17 -
>  1 file changed, 12 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/media/platform/soc_camera/rcar_vin.c 
> b/drivers/media/platform/soc_camera/rcar_vin.c
> index 00c1034..dab729a 100644
> --- a/drivers/media/platform/soc_camera/rcar_vin.c
> +++ b/drivers/media/platform/soc_camera/rcar_vin.c
> @@ -1697,7 +1697,7 @@ static int rcar_vin_try_fmt(struct soc_camera_device 
> *icd,
>   const struct soc_camera_format_xlate *xlate;
>   struct v4l2_pix_format *pix = &f->fmt.pix;
>   struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
> - struct v4l2_subdev_pad_config pad_cfg;
> + struct v4l2_subdev_pad_config *pad_cfg;
>   struct v4l2_subdev_format format = {
>   .which = V4L2_SUBDEV_FORMAT_TRY,
>   };
> @@ -1706,6 +1706,10 @@ static int rcar_vin_try_fmt(struct soc_camera_device 
> *icd,
>   int width, height;
>   int ret;
>  
> + pad_cfg = v4l2_subdev_alloc_pad_config(sd);
> + if (pad_cfg == NULL)
> + return -ENOMEM;
> +
>   xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);
>   if (!xlate) {
>   xlate = icd->current_fmt;
> @@ -1734,10 +1738,11 @@ static int rcar_vin_try_fmt(struct soc_camera_device 
> *icd,
>   mf->code = xlate->code;
>   mf->colorspace = pix->colorspace;
>  
> + format.pad = icd->src_pad_idx;
>   ret = v4l2_device_call_until_err(sd->v4l2_dev, soc_camera_grp_id(icd),
> -  pad, set_fmt, &pad_cfg, &format);
> +  pad, set_fmt, pad_cfg, &format);
>   if (ret < 0)
> - return ret;
> + goto cleanup;
>  
>   /* Adjust only if VIN cannot scale */
>   if (pix->width > mf->width * 2)
> @@ -1761,12 +1766,12 @@ static int rcar_vin_try_fmt(struct soc_camera_device 
> *icd,
>   mf->height = VIN_MAX_HEIGHT;
>   ret = v4l2_device_call_until_err(sd->v4l2_dev,
>soc_camera_grp_id(icd),
> -  pad, set_fmt, &pad_cfg,
> +  pad, set_fmt, pad_cfg,
>&format);
>   if (ret < 0) {
>   dev_err(icd->parent,
>   "client try_fmt() = %d\n", ret);
> - return ret;
> + goto cleanup;
>   }
>   }
>   /* We will scale exactly */
> @@ -1776,6 +1781,8 @@ static int rcar_vin_try_fmt(struct soc_camera_device 
> *icd,
>   pix->height = height;
>   }
>  
> +cleanup:
> + v4l2_subdev_free_pad_config(pad_cfg);
>   return ret;
>  }
>  
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html