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

Commit 31a7c549 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (5436): Fix TV output initialization 



The TV standard should be set AFTER the TV output is fully initialized.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent ddc285c7

drivers/media/video/ivtv/ivtv-driver.c

+1 −1
Original line number Diff line number Diff line
@@ -1170,7 +1170,6 @@ static int __devinit ivtv_probe(struct pci_dev *dev, 
	   in one place. */

	itv->std++;		/* Force full standard initialization */

	itv->std_out = itv->std;

	ivtv_v4l2_ioctls(itv, NULL, VIDIOC_S_STD, &itv->tuner_std);

	ivtv_v4l2_ioctls(itv, NULL, VIDIOC_S_FREQUENCY, &vf);



	retval = ivtv_streams_setup(itv);
@@ -1182,6 +1181,7 @@ static int __devinit ivtv_probe(struct pci_dev *dev, 
	if (itv->card->v4l2_capabilities & V4L2_CAP_VIDEO_OUTPUT) {

		ivtv_init_mpeg_decoder(itv);

	}

	ivtv_v4l2_ioctls(itv, NULL, VIDIOC_S_STD, &itv->tuner_std);



	IVTV_DEBUG_IRQ("Masking interrupts\n");

	/* clear interrupt mask, effectively disabling interrupts */