aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx23885/cx23885-dvb.c
diff options
context:
space:
mode:
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)
160 } 160 }
161 161
162 /* Put the analog decoder in standby to keep it quiet */ 162 /* Put the analog decoder in standby to keep it quiet */
163 /* Assumption here: analog decoder is only on i2c bus 0 */
163 cx23885_call_i2c_clients (&dev->i2c_bus[0], TUNER_SET_STANDBY, NULL); 164 cx23885_call_i2c_clients (&dev->i2c_bus[0], TUNER_SET_STANDBY, NULL);
164 165
165 /* register everything */ 166 /* register everything */
@@ -180,8 +181,6 @@ int cx23885_dvb_register(struct cx23885_tsport *port)
180 dev->pci_slot); 181 dev->pci_slot);
181 182
182 err = -ENODEV; 183 err = -ENODEV;
183 if (!(cx23885_boards[dev->board].portc & CX23885_MPEG_DVB))
184 goto fail_core;
185 184
186 /* dvb stuff */ 185 /* dvb stuff */
187 printk("%s: cx23885 based dvb card\n", dev->name); 186 printk("%s: cx23885 based dvb card\n", dev->name);
@@ -192,7 +191,6 @@ int cx23885_dvb_register(struct cx23885_tsport *port)
192 if (err != 0) 191 if (err != 0)
193 printk("%s() dvb_register failed err = %d\n", __FUNCTION__, err); 192 printk("%s() dvb_register failed err = %d\n", __FUNCTION__, err);
194 193
195 fail_core:
196 return err; 194 return err;
197} 195}
198 196