aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/em28xx/em28xx-dvb.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-04-17 21:37:53 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 14:09:41 -0300
commit3ca9c09379e8f3be0744c47f72769457fa46e9f3 (patch)
treeab50d7301c0fbf6d1c250f45864e851954a37609 /drivers/media/video/em28xx/em28xx-dvb.c
parent227ad4ab9058ef2624934183e8083886cf64bf56 (diff)
V4L/DVB (7597): em28xx: share the same xc3028 setup for analog and digital modes
Thanks to Devin Heitmueller <devin.heitmueller@gmail.com> and Aidan Thornton" <makosoft@googlemail.com> for pointing some errors with the previous scenario. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-dvb.c')
-rw-r--r--drivers/media/video/em28xx/em28xx-dvb.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index 1645021191a..1ceabeac4f7 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -20,8 +20,6 @@
#include <media/videobuf-vmalloc.h>
#include "lgdt330x.h"
-#include "tuner-xc2028.h"
-#include "tuner-xc2028-types.h"
MODULE_DESCRIPTION("driver for em28xx based DVB cards");
MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@infradead.org>");
@@ -69,12 +67,15 @@ static int attach_xc3028(u8 addr, struct em28xx *dev)
{
struct dvb_frontend *fe;
struct xc2028_ctrl ctl;
- struct xc2028_config cfg = {
- .i2c_adap = &dev->i2c_adap,
- .i2c_addr = addr,
- .ctrl = &ctl,
- .callback = em28xx_tuner_callback,
- };
+ struct xc2028_config cfg;
+
+ memset (&cfg, 0, sizeof(cfg));
+ cfg.i2c_adap = &dev->i2c_adap;
+ cfg.i2c_addr = addr;
+ cfg.ctrl = &ctl;
+ cfg.callback = em28xx_tuner_callback;
+
+ em28xx_setup_xc3028(dev, &ctl);
if (!dev->dvb.frontend) {
printk(KERN_ERR "%s/2: dvb frontend not attached. "