Commit 5e7fdc5e authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

V4L/DVB (7977): cx18: fix init order and remove duplicate open_on_first_use.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 388748e6
...@@ -751,17 +751,6 @@ static int __devinit cx18_probe(struct pci_dev *dev, ...@@ -751,17 +751,6 @@ static int __devinit cx18_probe(struct pci_dev *dev,
if (cx->options.radio > 0) if (cx->options.radio > 0)
cx->v4l2_cap |= V4L2_CAP_RADIO; 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) { if (cx->options.tuner > -1) {
struct tuner_setup setup; struct tuner_setup setup;
...@@ -788,7 +777,16 @@ static int __devinit cx18_probe(struct pci_dev *dev, ...@@ -788,7 +777,16 @@ static int __devinit cx18_probe(struct pci_dev *dev,
are not. */ are not. */
cx->tuner_std = cx->std; 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); CX18_INFO("Initialized card #%d: %s\n", cx->num, cx->card_name);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment