diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 17:12:20 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 17:12:20 +0200 |
| commit | 3856aa0c642dc34af7939e30f93e81eefbe0b935 (patch) | |
| tree | e55e69097c7f3186e38dc1d3b3d4a05f4e68b1e2 /drivers/media/video/au0828/au0828-dvb.c | |
| parent | aaaf92ba88d5a2664185ba20fd34308c8581d59f (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linus' into x86/cpatip-x86-cpa-2008-05-17-15-12-20
Diffstat (limited to 'drivers/media/video/au0828/au0828-dvb.c')
| -rw-r--r-- | drivers/media/video/au0828/au0828-dvb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/au0828/au0828-dvb.c b/drivers/media/video/au0828/au0828-dvb.c index 1371b4e4b5f1..c86a5f17eca8 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) dvb->frontend = dvb_attach(au8522_attach, &hauppauge_hvr950q_config, &dev->i2c_adap); - if (dvb->frontend != NULL) { - hauppauge_hvr950q_tunerconfig.priv = dev; + if (dvb->frontend != NULL) dvb_attach(xc5000_attach, dvb->frontend, &dev->i2c_adap, - &hauppauge_hvr950q_tunerconfig); - } + &hauppauge_hvr950q_tunerconfig, dev); break; default: printk(KERN_WARNING "The frontend of your DVB/ATSC card " |