Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf507158 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (10081): pxa-camera: call try_fmt() camera device method with correct pixel format 



With the introduction of the format conversion support in soc-camera, we now
also have to take care to pass the correct pixel format to the camera driver
when calling its try_fmt() method.

Signed-off-by: default avatarGuennadi Liakhovetski <lg@denx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 64f5905e

drivers/media/video/pxa_camera.c

+7 −1
Original line number Diff line number Diff line
@@ -1218,6 +1218,7 @@ static int pxa_camera_try_fmt(struct soc_camera_device *icd, 
	const struct soc_camera_format_xlate *xlate;

	struct v4l2_pix_format *pix = &f->fmt.pix;

	__u32 pixfmt = pix->pixelformat;

	int ret;



	xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);

	if (!xlate) {
@@ -1240,8 +1241,13 @@ static int pxa_camera_try_fmt(struct soc_camera_device *icd, 
		DIV_ROUND_UP(xlate->host_fmt->depth, 8);

	pix->sizeimage = pix->height * pix->bytesperline;



	/* camera has to see its format, but the user the original one */

	pix->pixelformat = xlate->cam_fmt->fourcc;

	/* limit to sensor capabilities */

	return icd->ops->try_fmt(icd, f);

	ret = icd->ops->try_fmt(icd, f);

	pix->pixelformat = xlate->host_fmt->fourcc;



	return ret;

}



static int pxa_camera_reqbufs(struct soc_camera_file *icf,