The patch number 7979 was added via Mauro Carvalho Chehab <[EMAIL PROTECTED]> to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: [EMAIL PROTECTED] ------ From: Mauro Carvalho Chehab <[EMAIL PROTECTED]> merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]> --- linux/drivers/media/video/cx18/cx18-driver.c | 22 ++++++++----------- linux/drivers/media/video/cx18/cx18-gpio.c | 2 - 2 files changed, 11 insertions(+), 13 deletions(-) diff -r 30ac74ed2dc4 -r 48b6dd04a56f linux/drivers/media/video/cx18/cx18-driver.c --- a/linux/drivers/media/video/cx18/cx18-driver.c Wed May 21 03:16:52 2008 +0000 +++ b/linux/drivers/media/video/cx18/cx18-driver.c Tue Jun 03 11:00:22 2008 -0300 @@ -751,17 +751,6 @@ static int __devinit cx18_probe(struct p 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 p 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); diff -r 30ac74ed2dc4 -r 48b6dd04a56f linux/drivers/media/video/cx18/cx18-gpio.c --- a/linux/drivers/media/video/cx18/cx18-gpio.c Wed May 21 03:16:52 2008 +0000 +++ b/linux/drivers/media/video/cx18/cx18-gpio.c Tue Jun 03 11:00:22 2008 -0300 @@ -62,7 +62,7 @@ void cx18_gpio_init(struct cx18 *cx) cx->gpio_dir = cx->card->gpio_init.direction; cx->gpio_val = cx->card->gpio_init.initial_value; - if (cx->card->xceive_pin) { + if (cx->card->tuners[0].tuner == TUNER_XC2028) { cx->gpio_dir |= 1 << cx->card->xceive_pin; cx->gpio_val |= 1 << cx->card->xceive_pin; } --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/48b6dd04a56fe37dd38fccacaff8f3376ff88d6b _______________________________________________ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits