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>

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. "