aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ov772x.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2012-07-18 09:53:59 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-30 18:15:13 -0400
commitf2730756ad9649762583cb013f31f636f88bbec0 (patch)
tree75a2fda91c03d703bbd0874294e720d3e0cce47c /drivers/media/video/ov772x.c
parentf98598391246068359604718cd925020d62bb40e (diff)
[media] ov772x: 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>
Diffstat (limited to 'drivers/media/video/ov772x.c')
-rw-r--r--drivers/media/video/ov772x.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c
index 74e77d327ed8..6d79b89b8603 100644
--- a/drivers/media/video/ov772x.c
+++ b/drivers/media/video/ov772x.c
@@ -880,15 +880,11 @@ static int ov772x_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
880static int ov772x_g_fmt(struct v4l2_subdev *sd, 880static int ov772x_g_fmt(struct v4l2_subdev *sd,
881 struct v4l2_mbus_framefmt *mf) 881 struct v4l2_mbus_framefmt *mf)
882{ 882{
883 struct i2c_client *client = v4l2_get_subdevdata(sd);
884 struct ov772x_priv *priv = container_of(sd, struct ov772x_priv, subdev); 883 struct ov772x_priv *priv = container_of(sd, struct ov772x_priv, subdev);
885 884
886 if (!priv->win || !priv->cfmt) { 885 if (!priv->win || !priv->cfmt) {
887 u32 width = VGA_WIDTH, height = VGA_HEIGHT; 886 priv->cfmt = &ov772x_cfmts[0];
888 int ret = ov772x_set_params(client, &width, &height, 887 priv->win = ov772x_select_win(VGA_WIDTH, VGA_HEIGHT);
889 V4L2_MBUS_FMT_YUYV8_2X8);
890 if (ret < 0)
891 return ret;
892 } 888 }
893 889
894 mf->width = priv->win->width; 890 mf->width = priv->win->width;