1 files changed, 16 insertions, 5 deletions

diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
index b5acb11c0bc9..36e0f8fee37a 100644
--- a/drivers/media/dvb/dvb-usb/digitv.c
+++ b/drivers/media/dvb/dvb-usb/digitv.c
@@ -118,7 +118,8 @@ static int digitv_nxt6000_tuner_set_params(struct dvb_frontend *fe, struct dvb_f
 {
         struct dvb_usb_adapter *adap = fe->dvb->priv;
         u8 b[5];
-        dvb_usb_tuner_calc_regs(fe,fep,b, 5);
+
+        fe->ops.tuner_ops.calc_regs(fe, fep, b, sizeof(b));
         if (fe->ops.i2c_gate_ctrl)
                 fe->ops.i2c_gate_ctrl(fe, 1);
         return digitv_ctrl_msg(adap->dev, USB_WRITE_TUNER, 0, &b[1], 4, NULL, 0);
@@ -130,12 +131,14 @@ static struct nxt6000_config digitv_nxt6000_config = {
 
 static int digitv_frontend_attach(struct dvb_usb_adapter *adap)
 {
+        struct digitv_state *st = adap->dev->priv;
+
         if ((adap->fe = dvb_attach(mt352_attach, &digitv_mt352_config, &adap->dev->i2c_adap)) != NULL) {
-                adap->fe->ops.tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
+                st->is_nxt6000 = 0;
                 return 0;
         }
         if ((adap->fe = dvb_attach(nxt6000_attach, &digitv_nxt6000_config, &adap->dev->i2c_adap)) != NULL) {
-                adap->fe->ops.tuner_ops.set_params = digitv_nxt6000_tuner_set_params;
+                st->is_nxt6000 = 1;
                 return 0;
         }
         return -EIO;
@@ -143,8 +146,14 @@ static int digitv_frontend_attach(struct dvb_usb_adapter *adap)
 
 static int digitv_tuner_attach(struct dvb_usb_adapter *adap)
 {
-        adap->pll_addr = 0x60;
-        adap->pll_desc = &dvb_pll_tded4;
+        struct digitv_state *st = adap->dev->priv;
+
+        if (!dvb_attach(dvb_pll_attach, adap->fe, 0x60, NULL, &dvb_pll_tded4))
+                return -ENODEV;
+
+        if (st->is_nxt6000)
+                adap->fe->ops.tuner_ops.set_params = digitv_nxt6000_tuner_set_params;
+
         return 0;
 }
 
@@ -273,6 +282,8 @@ static struct dvb_usb_device_properties digitv_properties = {
         .usb_ctrl = CYPRESS_FX2,
         .firmware = "dvb-usb-digitv-02.fw",
 
+        .size_of_priv = sizeof(struct digitv_state),
+
         .num_adapters = 1,
         .adapter = {
                 {