diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-07-18 10:53:58 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-07-30 19:14:48 -0300 |
| commit | f98598391246068359604718cd925020d62bb40e (patch) | |
| tree | 0a45c0a77768d3de1c0d4edd936e7e0008d5a172 | |
| parent | 2744782ef15151469ddd1e28c14e4b2c950be6dd (diff) | |
| download | linux-f98598391246068359604718cd925020d62bb40e.tar.gz linux-f98598391246068359604718cd925020d62bb40e.tar.bz2 linux-f98598391246068359604718cd925020d62bb40e.zip | |
[media] ov2640: Don't access the device in the g_mbus_fmt operation
The g_mbus_fmt operation only needs to return the current mbus frame
format and doesn't need to configure the hardware to do so. Fix it to
avoid requiring the chip to be powered on when calling the operation.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/video/ov2640.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/ov2640.c b/drivers/media/video/ov2640.c index 3c2c5d3bcc6b..7c44d1fe3c87 100644 --- a/drivers/media/video/ov2640.c +++ b/drivers/media/video/ov2640.c @@ -837,10 +837,8 @@ static int ov2640_g_fmt(struct v4l2_subdev *sd, if (!priv->win) { u32 width = W_SVGA, height = H_SVGA; - int ret = ov2640_set_params(client, &width, &height, - V4L2_MBUS_FMT_UYVY8_2X8); - if (ret < 0) - return ret; + priv->win = ov2640_select_win(&width, &height); + priv->cfmt_code = V4L2_MBUS_FMT_UYVY8_2X8; } mf->width = priv->win->width; |