[media] go7007: a small improvement to querystd handling
authorHans Verkuil <hans.verkuil@cisco.com>
Mon, 11 Mar 2013 21:58:21 +0000 (18:58 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 24 Mar 2013 15:58:51 +0000 (12:58 -0300)
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/staging/media/go7007/go7007-v4l2.c

index 93de97a0e530869562aaaebdc797639dc73a2e8d..4e5da87f4fa6ebfd3d943a48500acf2b620998d6 100644 (file)
@@ -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);