diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-24 01:33:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-24 01:33:08 -0300 |
| commit | 005392231f73c7f7781c04eebf5869c0174f503e (patch) | |
| tree | a261d186361d85d130fe033cc63d575421800727 /linux/drivers/media/video/cx231xx/cx231xx-cards.c | |
| parent | 59964b28e0205cdf0a4465194f40867b7c7f5aa6 (diff) | |
| parent | 2da45c822154d03cd7db86ac11b52385f1fac384 (diff) | |
| download | mediapointer-dvb-s2-005392231f73c7f7781c04eebf5869c0174f503e.tar.gz mediapointer-dvb-s2-005392231f73c7f7781c04eebf5869c0174f503e.tar.bz2 | |
merge: http://jusst.de/hg/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx231xx/cx231xx-cards.c')
| -rw-r--r-- | linux/drivers/media/video/cx231xx/cx231xx-cards.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/linux/drivers/media/video/cx231xx/cx231xx-cards.c b/linux/drivers/media/video/cx231xx/cx231xx-cards.c index d1872988a..af6169516 100644 --- a/linux/drivers/media/video/cx231xx/cx231xx-cards.c +++ b/linux/drivers/media/video/cx231xx/cx231xx-cards.c @@ -312,18 +312,18 @@ void cx231xx_card_setup(struct cx231xx *dev) /* request some modules */ if (dev->board.decoder == CX231XX_AVDECODER) { - dev->sd_cx25840 = - v4l2_i2c_new_subdev(&dev->i2c_bus[0].i2c_adap, + dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev, + &dev->i2c_bus[0].i2c_adap, "cx25840", "cx25840", 0x88 >> 1); if (dev->sd_cx25840 == NULL) cx231xx_info("cx25840 subdev registration failure\n"); - cx25840_call(dev, core, init, 0); + cx25840_call(dev, core, load_fw); } if (dev->board.tuner_type != TUNER_ABSENT) { - dev->sd_tuner = - v4l2_i2c_new_subdev(&dev->i2c_bus[1].i2c_adap, + dev->sd_tuner = v4l2_i2c_new_subdev(&dev->v4l2_dev, + &dev->i2c_bus[1].i2c_adap, "tuner", "tuner", 0xc2 >> 1); if (dev->sd_tuner == NULL) cx231xx_info("tuner subdev registration failure\n"); @@ -358,10 +358,7 @@ int cx231xx_config(struct cx231xx *dev) */ void cx231xx_config_i2c(struct cx231xx *dev) { - struct v4l2_routing route; - - route.input = INPUT(dev->video_input)->vmux; - route.output = 0; + /* u32 input = INPUT(dev->video_input)->vmux; */ call_all(dev, video, s_stream, 1); } @@ -683,9 +680,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface, */ /* Create v4l2 device */ - snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name), - "%s-%03d", "cx231xx", nr); - retval = v4l2_device_register(&udev->dev, &dev->v4l2_dev); + retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev); if (retval) { cx231xx_errdev("v4l2_device_register failed\n"); cx231xx_devused &= ~(1 << nr); |