Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28221f88 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Cc: Anatolij Gustschin <agust@denx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2766a7a9

drivers/media/platform/fsl-viu.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1475,7 +1475,6 @@ static struct video_device viu_template = { 
	.release	= video_device_release,

	.release	= video_device_release,





	.tvnorms        = V4L2_STD_NTSC_M | V4L2_STD_PAL,

	.tvnorms        = V4L2_STD_NTSC_M | V4L2_STD_PAL,

	.current_norm   = V4L2_STD_NTSC_M,

};

};





static int viu_of_probe(struct platform_device *op)

static int viu_of_probe(struct platform_device *op)
@@ -1546,6 +1545,7 @@ static int viu_of_probe(struct platform_device *op) 
	viu_dev->vidq.timeout.function = viu_vid_timeout;

	viu_dev->vidq.timeout.function = viu_vid_timeout;

	viu_dev->vidq.timeout.data     = (unsigned long)viu_dev;

	viu_dev->vidq.timeout.data     = (unsigned long)viu_dev;

	init_timer(&viu_dev->vidq.timeout);

	init_timer(&viu_dev->vidq.timeout);

	viu_dev->std = V4L2_STD_NTSC_M;

	viu_dev->first = 1;

	viu_dev->first = 1;





	/* Allocate memory for video device */

	/* Allocate memory for video device */