aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/media/go7007/go7007-v4l2.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-03-11 18:58:21 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-24 12:58:51 -0300
commit3e4c8478d4b3bff3ca6fb36f47e9f1c6600ecde9 (patch)
tree72fd84bcda1450e15eb5e917f438794008caf8d0 /drivers/staging/media/go7007/go7007-v4l2.c
parent98ded5904b0dca23146d4d80ad91ab800f35b576 (diff)
[media] go7007: a small improvement to querystd handling
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/media/go7007/go7007-v4l2.c')
-rw-r--r--drivers/staging/media/go7007/go7007-v4l2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/media/go7007/go7007-v4l2.c b/drivers/staging/media/go7007/go7007-v4l2.c
index 93de97a0e530..4e5da87f4fa6 100644
--- a/drivers/staging/media/go7007/go7007-v4l2.c
+++ b/drivers/staging/media/go7007/go7007-v4l2.c
@@ -652,12 +652,12 @@ static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *std)
static int go7007_s_std(struct go7007 *go)
{
- if (go->std & V4L2_STD_525_60) {
- go->standard = GO7007_STD_NTSC;
- go->sensor_framerate = 30000;
- } else {
+ if (go->std & V4L2_STD_625_50) {
go->standard = GO7007_STD_PAL;
go->sensor_framerate = 25025;
+ } else {
+ go->standard = GO7007_STD_NTSC;
+ go->sensor_framerate = 30000;
}
call_all(&go->v4l2_dev, core, s_std, go->std);