lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil
2008-05-30 10:51:53 -03:00
committed by Mauro Carvalho Chehab
parent 388748e61c
commit 5e7fdc5ed8
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/media/video/cx18/cx18-driver.c
View File

@ -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,
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);