diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-05-30 12:51:53 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-05-30 12:51:53 +0200 |
| commit | c9f65b1431da7ce5d47b478ab6939dd0c7ff75ee (patch) | |
| tree | f1223e2f8098e563a17ab49200e405a7209c394a /linux/drivers/media/video/cx18/cx18-driver.c | |
| parent | 60dda3e470db4161a70e2f306a032fe8561918e2 (diff) | |
| download | mediapointer-dvb-s2-c9f65b1431da7ce5d47b478ab6939dd0c7ff75ee.tar.gz mediapointer-dvb-s2-c9f65b1431da7ce5d47b478ab6939dd0c7ff75ee.tar.bz2 | |
cx18: fix init order and remove duplicate open_on_first_use.
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-driver.c')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-driver.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-driver.c b/linux/drivers/media/video/cx18/cx18-driver.c index d654b1d6e..2863a658f 100644 --- a/linux/drivers/media/video/cx18/cx18-driver.c +++ b/linux/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); |