aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/fsl-viu.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-06-03 04:36:43 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-17 08:35:07 -0400
commit28221f88efcf70814491a9695625d8257282d994 (patch)
tree0822b5770a38fc1fbd6ccbcb0336422eb00c0069 /drivers/media/platform/fsl-viu.c
parent2766a7a99950b5a0033b449dacc04070654b0357 (diff)
[media] fsl-viu: remove current_norm
The use of current_norm is deprecated, so remove it. This driver actually already implements g_std, which overrides current_norm, but the 'std' field was never initialized correctly. This has been fixed as well. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Cc: Anatolij Gustschin <agust@denx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/fsl-viu.c')
-rw-r--r--drivers/media/platform/fsl-viu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c
index 3a6a0dcdc3e4..221ec428a01e 100644
--- a/drivers/media/platform/fsl-viu.c
+++ b/drivers/media/platform/fsl-viu.c
@@ -1475,7 +1475,6 @@ static struct video_device viu_template = {
1475 .release = video_device_release, 1475 .release = video_device_release,
1476 1476
1477 .tvnorms = V4L2_STD_NTSC_M | V4L2_STD_PAL, 1477 .tvnorms = V4L2_STD_NTSC_M | V4L2_STD_PAL,
1478 .current_norm = V4L2_STD_NTSC_M,
1479}; 1478};
1480 1479
1481static int viu_of_probe(struct platform_device *op) 1480static int viu_of_probe(struct platform_device *op)
@@ -1546,6 +1545,7 @@ static int viu_of_probe(struct platform_device *op)
1546 viu_dev->vidq.timeout.function = viu_vid_timeout; 1545 viu_dev->vidq.timeout.function = viu_vid_timeout;
1547 viu_dev->vidq.timeout.data = (unsigned long)viu_dev; 1546 viu_dev->vidq.timeout.data = (unsigned long)viu_dev;
1548 init_timer(&viu_dev->vidq.timeout); 1547 init_timer(&viu_dev->vidq.timeout);
1548 viu_dev->std = V4L2_STD_NTSC_M;
1549 viu_dev->first = 1; 1549 viu_dev->first = 1;
1550 1550
1551 /* Allocate memory for video device */ 1551 /* Allocate memory for video device */