aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2012-07-15 17:23:05 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-30 22:01:08 -0300
commit7980a4d544a451bd99ee9f8714f7dc6d5104a2b7 (patch)
treeb00a9a914e539b97e7a4f783241ab57860e400ea /drivers/media
parentfc4b3fa714fb2a078531bccb501cf2ef8c7f888a (diff)
downloadlinux-linaro-stable-7980a4d544a451bd99ee9f8714f7dc6d5104a2b7.tar.gz
[media] via-camera: pass correct format settings to sensor
The code attempts to maintain a "user format" and a "sensor format", but in this case it looks like a typo is passing the user format down to the sensor. This was preventing display of video at anything other than 640x480. Signed-off-by: Daniel Drake <dsd@laptop.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/via-camera.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/via-camera.c b/drivers/media/video/via-camera.c
index 308e150a39bc..eb404c2ce270 100644
--- a/drivers/media/video/via-camera.c
+++ b/drivers/media/video/via-camera.c
@@ -963,7 +963,7 @@ static int viacam_do_try_fmt(struct via_camera *cam,
upix->pixelformat = f->pixelformat;
viacam_fmt_pre(upix, spix);
- v4l2_fill_mbus_format(&mbus_fmt, upix, f->mbus_code);
+ v4l2_fill_mbus_format(&mbus_fmt, spix, f->mbus_code);
ret = sensor_call(cam, video, try_mbus_fmt, &mbus_fmt);
v4l2_fill_pix_format(spix, &mbus_fmt);
viacam_fmt_post(upix, spix);