From f21bb15b0943db0c493182abf39e535e6ec18ae6 Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Sun, 15 Jul 2012 17:23:05 -0300 Subject: [PATCH] --- yaml --- r: 320692 b: refs/heads/master c: 7980a4d544a451bd99ee9f8714f7dc6d5104a2b7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/via-camera.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9070552eaf81..5b6ae7c57868 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc4b3fa714fb2a078531bccb501cf2ef8c7f888a +refs/heads/master: 7980a4d544a451bd99ee9f8714f7dc6d5104a2b7 diff --git a/trunk/drivers/media/video/via-camera.c b/trunk/drivers/media/video/via-camera.c index 308e150a39bc..eb404c2ce270 100644 --- a/trunk/drivers/media/video/via-camera.c +++ b/trunk/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);