mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
V4L/DVB (5436): Fix TV output initialization
The TV standard should be set AFTER the TV output is fully initialized. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
ddc285c763
commit
31a7c549ed
1 changed files with 1 additions and 1 deletions
|
@ -1170,7 +1170,6 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
|
||||||
in one place. */
|
in one place. */
|
||||||
itv->std++; /* Force full standard initialization */
|
itv->std++; /* Force full standard initialization */
|
||||||
itv->std_out = itv->std;
|
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);
|
ivtv_v4l2_ioctls(itv, NULL, VIDIOC_S_FREQUENCY, &vf);
|
||||||
|
|
||||||
retval = ivtv_streams_setup(itv);
|
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) {
|
if (itv->card->v4l2_capabilities & V4L2_CAP_VIDEO_OUTPUT) {
|
||||||
ivtv_init_mpeg_decoder(itv);
|
ivtv_init_mpeg_decoder(itv);
|
||||||
}
|
}
|
||||||
|
ivtv_v4l2_ioctls(itv, NULL, VIDIOC_S_STD, &itv->tuner_std);
|
||||||
|
|
||||||
IVTV_DEBUG_IRQ("Masking interrupts\n");
|
IVTV_DEBUG_IRQ("Masking interrupts\n");
|
||||||
/* clear interrupt mask, effectively disabling interrupts */
|
/* clear interrupt mask, effectively disabling interrupts */
|
||||||
|
|
Loading…
Reference in a new issue