From e778920be65c8c2a7d5849e7771b56fecf906682 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 30 May 2008 10:51:53 -0300 Subject: [PATCH] --- yaml --- r: 97757 b: refs/heads/master c: 5e7fdc5ed820516f8253cc7daad27cf3ee6bd784 h: refs/heads/master i: 97755: 36c4ef28bb0f650c80b45edf2c5ea199db62a33c v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx18/cx18-driver.c | 22 +++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 120105652257..e08496ced203 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 388748e61cc59487c34e1dfa890ffc44e4d16b1f +refs/heads/master: 5e7fdc5ed820516f8253cc7daad27cf3ee6bd784 diff --git a/trunk/drivers/media/video/cx18/cx18-driver.c b/trunk/drivers/media/video/cx18/cx18-driver.c index 4f5d23127fc6..2b810bb2a4c7 100644 --- a/trunk/drivers/media/video/cx18/cx18-driver.c +++ b/trunk/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);