aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2007-03-13 19:22:40 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-04-27 15:44:46 -0300
commit31a7c549eda6bf0a38d8fc12c903a8535a9f27ca (patch)
tree9d24efcbd501ac7de84b0a46902e75ce08c80f87 /drivers
parentddc285c7632b64fb1ac3ec8f25bcc8abd4a1f727 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/ivtv/ivtv-driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index c7648e2a3a6..8b5597ff3cd 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -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 */