diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-05-30 10:51:53 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-05 06:35:54 -0300 |
| commit | 5e7fdc5ed820516f8253cc7daad27cf3ee6bd784 (patch) | |
| tree | 598a6f8e1ea2ec1a3700512dc15fa10deea21ba8 /drivers | |
| parent | 388748e61cc59487c34e1dfa890ffc44e4d16b1f (diff) | |
| download | kernel_samsung_espresso10-5e7fdc5ed820516f8253cc7daad27cf3ee6bd784.zip kernel_samsung_espresso10-5e7fdc5ed820516f8253cc7daad27cf3ee6bd784.tar.gz kernel_samsung_espresso10-5e7fdc5ed820516f8253cc7daad27cf3ee6bd784.tar.bz2 | |
V4L/DVB (7977): cx18: fix init order and remove duplicate open_on_first_use.
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/cx18/cx18-driver.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c index 4f5d231..2b810bb 100644 --- a/drivers/media/video/cx18/cx18-driver.c +++ b/drivers/media/video/cx18/cx18-driver.c @@ -751,17 +751,6 @@ static int __devinit cx18_probe(struct pci_dev *dev, if (cx->options.radio > 0) cx->v4l2_cap |= V4L2_CAP_RADIO; - retval = cx18_streams_setup(cx); - if (retval) { - CX18_ERR("Error %d setting up streams\n", retval); - goto free_irq; - } - retval = cx18_streams_register(cx); - if (retval) { - CX18_ERR("Error %d registering devices\n", retval); - goto free_streams; - } - if (cx->options.tuner > -1) { struct tuner_setup setup; @@ -788,7 +777,16 @@ static int __devinit cx18_probe(struct pci_dev *dev, are not. */ cx->tuner_std = cx->std; - cx18_init_on_first_open(cx); + retval = cx18_streams_setup(cx); + if (retval) { + CX18_ERR("Error %d setting up streams\n", retval); + goto free_irq; + } + retval = cx18_streams_register(cx); + if (retval) { + CX18_ERR("Error %d registering devices\n", retval); + goto free_streams; + } CX18_INFO("Initialized card #%d: %s\n", cx->num, cx->card_name); |