summaryrefslogtreecommitdiff
path: root/drivers/media/video/cx23885/cx23885-dvb.c
diff options
context:
space:
mode:
authorSteven Toth <stoth@hauppauge.com>2007-09-08 21:31:56 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 22:14:29 -0300
commita6a3f14035fe94c0925fea62f3d3a7a1ab44c1f1 (patch)
treeb20370fa8929c296242c941b24d6bda95000d366 /drivers/media/video/cx23885/cx23885-dvb.c
parent15e90839512a2c7d2b7f801af8f9057279e3f813 (diff)
V4L/DVB (6199): cx23885: Changes to allow demodulators on each transport bus
cx23885: Changes to allow demodulators on each transport bus. Signed-off-by: Steven Toth <stoth@hauppauge.com> Reviewed-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-dvb.c')
-rw-r--r--drivers/media/video/cx23885/cx23885-dvb.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index 0ace919195df..e0dc1495b8cd 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -160,6 +160,7 @@ static int dvb_register(struct cx23885_tsport *port)
}
/* Put the analog decoder in standby to keep it quiet */
+ /* Assumption here: analog decoder is only on i2c bus 0 */
cx23885_call_i2c_clients (&dev->i2c_bus[0], TUNER_SET_STANDBY, NULL);
/* register everything */
@@ -180,8 +181,6 @@ int cx23885_dvb_register(struct cx23885_tsport *port)
dev->pci_slot);
err = -ENODEV;
- if (!(cx23885_boards[dev->board].portc & CX23885_MPEG_DVB))
- goto fail_core;
/* dvb stuff */
printk("%s: cx23885 based dvb card\n", dev->name);
@@ -192,7 +191,6 @@ int cx23885_dvb_register(struct cx23885_tsport *port)
if (err != 0)
printk("%s() dvb_register failed err = %d\n", __FUNCTION__, err);
- fail_core:
return err;
}