Skip to contentSkip to conversation

media: ov2640: fix initial try format

PATCH New Akinobu Mita 1 participant 1 message Jan 22, 2019

Subsystems (2)
Media (V4L/DVB) V4L2 camera sensor drivers
lore
Share & tools
lore

Akinobu Mita

author
#0 lore raw

PATCH 1/1 media: ov2640: fix initial try format

Set initial try format with default configuration instead of current one.

Fixes 8d3b307a150a ("media: ov2640: make VIDIOC_SUBDEV_G_FMT ioctl work with V4L2_SUBDEV_FORMAT_TRY")
Cc Sakari Ailus <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Signed-off-by Akinobu Mita <[email protected]>
---
 drivers/media/i2c/ov2640.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/media/i2c/ov2640.c +5 -5
index 37e7c98..83031cf 100644
@@ -1011,14 +1011,14 @@ static int ov2640_init_cfg(struct v4l2_subdev *sd,
 			   struct v4l2_subdev_pad_config *cfg)
 {
 #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
-	struct i2c_client *client = v4l2_get_subdevdata(sd);
-	struct ov2640_priv *priv = to_ov2640(client);
 	struct v4l2_mbus_framefmt *try_fmt =
 		v4l2_subdev_get_try_format(sd, cfg, 0);
+	const struct ov2640_win_size *win =
+		ov2640_select_win(SVGA_WIDTH, SVGA_HEIGHT);
 
-	try_fmt->width = priv->win->width;
-	try_fmt->height = priv->win->height;
-	try_fmt->code = priv->cfmt_code;
+	try_fmt->width = win->width;
+	try_fmt->height = win->height;
+	try_fmt->code = MEDIA_BUS_FMT_UYVY8_2X8;
 	try_fmt->colorspace = V4L2_COLORSPACE_SRGB;
 	try_fmt->field = V4L2_FIELD_NONE;
 	try_fmt->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;
Signature · 1 line
2.7.4