From 3e4c8478d4b3bff3ca6fb36f47e9f1c6600ecde9 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Mon, 11 Mar 2013 18:58:21 -0300 Subject: [PATCH] [media] go7007: a small improvement to querystd handling Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/media/go7007/go7007-v4l2.c | 8 ++++---- 1 file 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); -- 2.20.1