aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/tw9910.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2012-07-18 09:54:00 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-30 18:15:53 -0400
commit7bf6afbb6b528335290e73b74c7f9a8596ef5689 (patch)
tree0925e0817cae1d2ae3dd0a5248113c7bc08cd999 /drivers/media/video/tw9910.c
parentf2730756ad9649762583cb013f31f636f88bbec0 (diff)
[media] tw9910: 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/tw9910.c')
-rw-r--r--drivers/media/video/tw9910.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/video/tw9910.c b/drivers/media/video/tw9910.c
index 8768efb8508a..9f53eacb66e3 100644
--- a/drivers/media/video/tw9910.c
+++ b/drivers/media/video/tw9910.c
@@ -699,11 +699,9 @@ static int tw9910_g_fmt(struct v4l2_subdev *sd,
699 struct tw9910_priv *priv = to_tw9910(client); 699 struct tw9910_priv *priv = to_tw9910(client);
700 700
701 if (!priv->scale) { 701 if (!priv->scale) {
702 int ret; 702 priv->scale = tw9910_select_norm(priv->norm, 640, 480);
703 u32 width = 640, height = 480; 703 if (!priv->scale)
704 ret = tw9910_set_frame(sd, &width, &height); 704 return -EINVAL;
705 if (ret < 0)
706 return ret;
707 } 705 }
708 706
709 mf->width = priv->scale->width; 707 mf->width = priv->scale->width;