2 files changed, 1 insertions, 5 deletions

diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index 21b8f1d48024..39581d976e01 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -214,17 +214,13 @@ static struct zl10353_config em28xx_zl10353_with_xc3028 = {
 static int attach_xc3028(u8 addr, struct em28xx *dev)
 {
         struct dvb_frontend *fe;
-        struct xc2028_ctrl ctl;
         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. "
                                 "Can't attach xc3028\n",
diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
index 95d5922eac95..9dd688ec3cff 100644
--- a/drivers/media/video/tuner-xc2028.c
+++ b/drivers/media/video/tuner-xc2028.c
@@ -130,7 +130,7 @@ struct xc2028_data {
         _rc;                                                            \
 })
 
-static unsigned int xc2028_get_reg(struct xc2028_data *priv, u16 reg, u16 *val)
+static int xc2028_get_reg(struct xc2028_data *priv, u16 reg, u16 *val)
 {
         unsigned char buf[2];
         unsigned char ibuf[2];