From: Hans Verkuil <[email protected]> It was pointless anyway since fsl-viu already implements g_std.
Signed-off-by: Hans Verkuil <[email protected]> --- drivers/media/platform/fsl-viu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c index 961fc72..c7c1295 100644 --- a/drivers/media/platform/fsl-viu.c +++ b/drivers/media/platform/fsl-viu.c @@ -1376,8 +1376,7 @@ static struct video_device viu_template = { .ioctl_ops = &viu_ioctl_ops, .release = video_device_release, - .tvnorms = V4L2_STD_NTSC_M | V4L2_STD_PAL, - .current_norm = V4L2_STD_NTSC_M, + .tvnorms = V4L2_STD_ALL, }; static int viu_of_probe(struct platform_device *op) @@ -1452,6 +1451,7 @@ static int viu_of_probe(struct platform_device *op) /* This control handler will inherit the control(s) from the sub-device(s). */ viu_dev->v4l2_dev.ctrl_handler = &viu_dev->hdl; + viu_dev->std = V4L2_STD_NTSC_M; viu_dev->decoder = v4l2_i2c_new_subdev(&viu_dev->v4l2_dev, ad, "saa7113", VIU_VIDEO_DECODER_ADDR, NULL); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
