diff mbox

video: mx2_camera: Fix build error due to the lack of 'pixfmt' definition

Message ID 1337638227-20379-1-git-send-email-fabio.estevam@freescale.com (mailing list archive)
State Rejected, archived
Headers

Commit Message

Fabio Estevam May 21, 2012, 10:10 p.m. UTC 
  commit d509835 ([media] media: mx2_camera: Fix mbus format handling) caused
the following build error:

drivers/media/video/mx2_camera.c:1032:42: error: 'pixfmt' undeclared (first use in this function)
make[4]: *** [drivers/media/video/mx2_camera.o] Error 1

Fix this build error by providing a 'pixfmt' definition.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 drivers/media/video/mx2_camera.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Comments

Javier Martin June 1, 2012, 9:35 a.m. UTC | #1 
Hi Fabio,

On 22 May 2012 00:10, Fabio Estevam <fabio.estevam@freescale.com> wrote:
> commit d509835 ([media] media: mx2_camera: Fix mbus format handling) caused
> the following build error:
>
> drivers/media/video/mx2_camera.c:1032:42: error: 'pixfmt' undeclared (first use in this function)
> make[4]: *** [drivers/media/video/mx2_camera.o] Error 1
>
> Fix this build error by providing a 'pixfmt' definition.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>  drivers/media/video/mx2_camera.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c
> index ded26b7..ef72733 100644
> --- a/drivers/media/video/mx2_camera.c
> +++ b/drivers/media/video/mx2_camera.c
> @@ -989,6 +989,7 @@ static int mx2_camera_set_bus_param(struct soc_camera_device *icd)
>        int ret;
>        int bytesperline;
>        u32 csicr1 = pcdev->csicr1;
> +       u32 pixfmt = icd->current_fmt->host_fmt->fourcc;
>
>        ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
>        if (!ret) {
> --
> 1.7.1

This patch is not needed anymore since Guennadi has requested one of
my patches to be removed from 'for_v3.5':

[PATCH] Revert "[media] media: mx2_camera: Fix mbus format handling"

And I've sent a new version addressing this merge issue and the
problem mentioned by Guennadi:

[PATCH v3][for_v3.5] media: mx2_camera: Fix mbus format handling
diff mbox

Patch

diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c
index ded26b7..ef72733 100644
--- a/drivers/media/video/mx2_camera.c
+++ b/drivers/media/video/mx2_camera.c
@@ -989,6 +989,7 @@  static int mx2_camera_set_bus_param(struct soc_camera_device *icd)
 	int ret;
 	int bytesperline;
 	u32 csicr1 = pcdev->csicr1;
+	u32 pixfmt = icd->current_fmt->host_fmt->fourcc;
 
 	ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
 	if (!ret) {