aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2012-07-18 09:53:58 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-30 18:14:48 -0400
commitf98598391246068359604718cd925020d62bb40e (patch)
tree0a45c0a77768d3de1c0d4edd936e7e0008d5a172
parent2744782ef15151469ddd1e28c14e4b2c950be6dd (diff)
[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.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/ov2640.c b/drivers/media/video/ov2640.c
index 3c2c5d3bcc6..7c44d1fe3c8 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,
837 837
838 if (!priv->win) { 838 if (!priv->win) {
839 u32 width = W_SVGA, height = H_SVGA; 839 u32 width = W_SVGA, height = H_SVGA;
840 int ret = ov2640_set_params(client, &width, &height, 840 priv->win = ov2640_select_win(&width, &height);
841 V4L2_MBUS_FMT_UYVY8_2X8); 841 priv->cfmt_code = V4L2_MBUS_FMT_UYVY8_2X8;
842 if (ret < 0)
843 return ret;
844 } 842 }
845 843
846 mf->width = priv->win->width; 844 mf->width = priv->win->width;