diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-03-13 23:22:40 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-04-27 20:44:46 +0200 |
| commit | 31a7c549eda6bf0a38d8fc12c903a8535a9f27ca (patch) | |
| tree | 9d24efcbd501ac7de84b0a46902e75ce08c80f87 /drivers/media | |
| parent | V4L/DVB (5434): Updates to the tveeprom tuner, video decoder and audio chip (diff) | |
| download | linux-31a7c549eda6bf0a38d8fc12c903a8535a9f27ca.tar.xz linux-31a7c549eda6bf0a38d8fc12c903a8535a9f27ca.zip | |
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/media')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.c | 2 |
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 c7648e2a3a67..8b5597ff3cd7 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 */ |