diff options
Diffstat (limited to 'drivers/media/video/au0828/au0828-dvb.c')
-rw-r--r-- | drivers/media/video/au0828/au0828-dvb.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/media/video/au0828/au0828-dvb.c b/drivers/media/video/au0828/au0828-dvb.c index 1371b4e4b5f1..c6d470590380 100644 --- a/drivers/media/video/au0828/au0828-dvb.c +++ b/drivers/media/video/au0828/au0828-dvb.c | |||
@@ -337,12 +337,10 @@ int au0828_dvb_register(struct au0828_dev *dev) | |||
337 | dvb->frontend = dvb_attach(au8522_attach, | 337 | dvb->frontend = dvb_attach(au8522_attach, |
338 | &hauppauge_hvr950q_config, | 338 | &hauppauge_hvr950q_config, |
339 | &dev->i2c_adap); | 339 | &dev->i2c_adap); |
340 | if (dvb->frontend != NULL) { | 340 | if (dvb->frontend != NULL) |
341 | hauppauge_hvr950q_tunerconfig.priv = dev; | ||
342 | dvb_attach(xc5000_attach, dvb->frontend, | 341 | dvb_attach(xc5000_attach, dvb->frontend, |
343 | &dev->i2c_adap, | 342 | &dev->i2c_adap, |
344 | &hauppauge_hvr950q_tunerconfig); | 343 | &hauppauge_hvr950q_tunerconfig, dev); |
345 | } | ||
346 | break; | 344 | break; |
347 | default: | 345 | default: |
348 | printk(KERN_WARNING "The frontend of your DVB/ATSC card " | 346 | printk(KERN_WARNING "The frontend of your DVB/ATSC card " |
@@ -355,12 +353,6 @@ int au0828_dvb_register(struct au0828_dev *dev) | |||
355 | return -1; | 353 | return -1; |
356 | } | 354 | } |
357 | 355 | ||
358 | /* Put the analog decoder in standby to keep it quiet */ | ||
359 | au0828_call_i2c_clients(dev, TUNER_SET_STANDBY, NULL); | ||
360 | |||
361 | if (dvb->frontend->ops.analog_ops.standby) | ||
362 | dvb->frontend->ops.analog_ops.standby(dvb->frontend); | ||
363 | |||
364 | /* register everything */ | 356 | /* register everything */ |
365 | ret = dvb_register(dev); | 357 | ret = dvb_register(dev); |
366 | if (ret < 0) { | 358 | if (ret < 0) { |