24 files changed, 172 insertions, 107 deletions

diff --git a/drivers/media/dvb/b2c2/Kconfig b/drivers/media/dvb/b2c2/Kconfig
index d7f1fd5b7b02..49a06fc54c51 100644
--- a/drivers/media/dvb/b2c2/Kconfig
+++ b/drivers/media/dvb/b2c2/Kconfig
@@ -1,6 +1,7 @@
 config DVB_B2C2_FLEXCOP
         tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
         depends on DVB_CORE && I2C
+        select DVB_PLL
         select DVB_STV0299
         select DVB_MT352
         select DVB_MT312
diff --git a/drivers/media/dvb/bt8xx/Kconfig b/drivers/media/dvb/bt8xx/Kconfig
index f394002118f8..7d0ee1ab2903 100644
--- a/drivers/media/dvb/bt8xx/Kconfig
+++ b/drivers/media/dvb/bt8xx/Kconfig
@@ -1,6 +1,7 @@
 config DVB_BT8XX
         tristate "BT8xx based PCI cards"
         depends on DVB_CORE && PCI && I2C && VIDEO_BT848
+        select DVB_PLL
         select DVB_MT352
         select DVB_SP887X
         select DVB_NXT6000
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index d687a14ec0a7..06ac899a9a26 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -393,7 +393,7 @@ static int dst_set_bandwidth(struct dst_state *state, fe_bandwidth_t bandwidth)
         state->bandwidth = bandwidth;
 
         if (state->dst_type != DST_TYPE_IS_TERR)
-                return 0;
+                return -EOPNOTSUPP;
 
         switch (bandwidth) {
         case BANDWIDTH_6_MHZ:
@@ -462,7 +462,7 @@ static int dst_set_symbolrate(struct dst_state *state, u32 srate)
 
         state->symbol_rate = srate;
         if (state->dst_type == DST_TYPE_IS_TERR) {
-                return 0;
+                return -EOPNOTSUPP;
         }
         dprintk(verbose, DST_INFO, 1, "set symrate %u", srate);
         srate /= 1000;
@@ -504,7 +504,7 @@ static int dst_set_symbolrate(struct dst_state *state, u32 srate)
 static int dst_set_modulation(struct dst_state *state, fe_modulation_t modulation)
 {
         if (state->dst_type != DST_TYPE_IS_CABLE)
-                return 0;
+                return -EOPNOTSUPP;
 
         state->modulation = modulation;
         switch (modulation) {
@@ -1234,7 +1234,7 @@ int dst_command(struct dst_state *state, u8 *data, u8 len)
                 goto error;
         }
         if (write_dst(state, data, len)) {
-                dprintk(verbose, DST_INFO, 1, "Tring to recover.. ");
+                dprintk(verbose, DST_INFO, 1, "Trying to recover.. ");
                 if ((dst_error_recovery(state)) < 0) {
                         dprintk(verbose, DST_ERROR, 1, "Recovery Failed.");
                         goto error;
@@ -1328,15 +1328,13 @@ static int dst_tone_power_cmd(struct dst_state *state)
 {
         u8 paket[8] = { 0x00, 0x09, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00 };
 
-        if (state->dst_type == DST_TYPE_IS_TERR)
-                return 0;
+        if (state->dst_type != DST_TYPE_IS_SAT)
+                return -EOPNOTSUPP;
         paket[4] = state->tx_tuna[4];
         paket[2] = state->tx_tuna[2];
         paket[3] = state->tx_tuna[3];
         paket[7] = dst_check_sum (paket, 7);
-        dst_command(state, paket, 8);
-
-        return 0;
+        return dst_command(state, paket, 8);
 }
 
 static int dst_get_tuna(struct dst_state *state)
@@ -1465,7 +1463,7 @@ static int dst_set_diseqc(struct dvb_frontend *fe, struct dvb_diseqc_master_cmd
         u8 paket[8] = { 0x00, 0x08, 0x04, 0xe0, 0x10, 0x38, 0xf0, 0xec };
 
         if (state->dst_type != DST_TYPE_IS_SAT)
-                return 0;
+                return -EOPNOTSUPP;
         if (cmd->msg_len > 0 && cmd->msg_len < 5)
                 memcpy(&paket[3], cmd->msg, cmd->msg_len);
         else if (cmd->msg_len == 5 && state->dst_hw_cap & DST_TYPE_HAS_DISEQC5)
@@ -1473,18 +1471,17 @@ static int dst_set_diseqc(struct dvb_frontend *fe, struct dvb_diseqc_master_cmd
         else
                 return -EINVAL;
         paket[7] = dst_check_sum(&paket[0], 7);
-        dst_command(state, paket, 8);
-        return 0;
+        return dst_command(state, paket, 8);
 }
 
 static int dst_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
 {
-        int need_cmd;
+        int need_cmd, retval = 0;
         struct dst_state *state = fe->demodulator_priv;
 
         state->voltage = voltage;
         if (state->dst_type != DST_TYPE_IS_SAT)
-                return 0;
+                return -EOPNOTSUPP;
 
         need_cmd = 0;
 
@@ -1506,9 +1503,9 @@ static int dst_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
         }
 
         if (need_cmd)
-                dst_tone_power_cmd(state);
+                retval = dst_tone_power_cmd(state);
 
-        return 0;
+        return retval;
 }
 
 static int dst_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)
@@ -1517,7 +1514,7 @@ static int dst_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)
 
         state->tone = tone;
         if (state->dst_type != DST_TYPE_IS_SAT)
-                return 0;
+                return -EOPNOTSUPP;
 
         switch (tone) {
         case SEC_TONE_OFF:
@@ -1533,9 +1530,7 @@ static int dst_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)
         default:
                 return -EINVAL;
         }
-        dst_tone_power_cmd(state);
-
-        return 0;
+        return dst_tone_power_cmd(state);
 }
 
 static int dst_send_burst(struct dvb_frontend *fe, fe_sec_mini_cmd_t minicmd)
@@ -1543,7 +1538,7 @@ static int dst_send_burst(struct dvb_frontend *fe, fe_sec_mini_cmd_t minicmd)
         struct dst_state *state = fe->demodulator_priv;
 
         if (state->dst_type != DST_TYPE_IS_SAT)
-                return 0;
+                return -EOPNOTSUPP;
         state->minicmd = minicmd;
         switch (minicmd) {
         case SEC_MINI_A:
@@ -1553,9 +1548,7 @@ static int dst_send_burst(struct dvb_frontend *fe, fe_sec_mini_cmd_t minicmd)
                 state->tx_tuna[3] = 0xff;
                 break;
         }
-        dst_tone_power_cmd(state);
-
-        return 0;
+        return dst_tone_power_cmd(state);
 }
 
 
@@ -1608,28 +1601,31 @@ static int dst_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
 {
         struct dst_state *state = fe->demodulator_priv;
 
-        dst_get_signal(state);
+        int retval = dst_get_signal(state);
         *strength = state->decode_strength;
 
-        return 0;
+        return retval;
 }
 
 static int dst_read_snr(struct dvb_frontend *fe, u16 *snr)
 {
         struct dst_state *state = fe->demodulator_priv;
 
-        dst_get_signal(state);
+        int retval = dst_get_signal(state);
         *snr = state->decode_snr;
 
-        return 0;
+        return retval;
 }
 
 static int dst_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)
 {
+        int retval = -EINVAL;
         struct dst_state *state = fe->demodulator_priv;
 
         if (p != NULL) {
-                dst_set_freq(state, p->frequency);
+                retval = dst_set_freq(state, p->frequency);
+                if(retval != 0)
+                        return retval;
                 dprintk(verbose, DST_DEBUG, 1, "Set Frequency=[%d]", p->frequency);
 
                 if (state->dst_type == DST_TYPE_IS_SAT) {
@@ -1647,10 +1643,10 @@ static int dst_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_paramet
                         dst_set_symbolrate(state, p->u.qam.symbol_rate);
                         dst_set_modulation(state, p->u.qam.modulation);
                 }
-                dst_write_tuna(fe);
+                retval = dst_write_tuna(fe);
         }
 
-        return 0;
+        return retval;
 }
 
 static int dst_tune_frontend(struct dvb_frontend* fe,
diff --git a/drivers/media/dvb/dvb-core/Makefile b/drivers/media/dvb/dvb-core/Makefile
index 11054657fdb5..0b5182835cc8 100644
--- a/drivers/media/dvb/dvb-core/Makefile
+++ b/drivers/media/dvb/dvb-core/Makefile
@@ -2,8 +2,8 @@
 # Makefile for the kernel DVB device drivers.
 #
 
-dvb-core-objs = dvbdev.o dmxdev.o dvb_demux.o dvb_filter.o      \
-                dvb_ca_en50221.o dvb_frontend.o                 \
-                dvb_net.o dvb_ringbuffer.o dvb_math.o
+dvb-core-objs := dvbdev.o dmxdev.o dvb_demux.o dvb_filter.o     \
+                 dvb_ca_en50221.o dvb_frontend.o                \
+                 dvb_net.o dvb_ringbuffer.o dvb_math.o
 
 obj-$(CONFIG_DVB_CORE) += dvb-core.o
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 59ac35ddd51e..57b34cda99f5 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -526,7 +526,9 @@ static int dvb_frontend_thread(void *data)
         fepriv->delay = 3*HZ;
         fepriv->status = 0;
         fepriv->wakeup = 0;
-        fepriv->reinitialise = 1;
+        fepriv->reinitialise = 0;
+
+        dvb_frontend_init(fe);
 
         while (1) {
                 up(&fepriv->sem);           /* is locked when we enter the thread... */
@@ -1013,17 +1015,18 @@ static int dvb_frontend_open(struct inode *inode, struct file *file)
                 return ret;
 
         if ((file->f_flags & O_ACCMODE) != O_RDONLY) {
+
+                /* normal tune mode when opened R/W */
+                fepriv->tune_mode_flags &= ~FE_TUNE_MODE_ONESHOT;
+                fepriv->tone = -1;
+                fepriv->voltage = -1;
+
                 ret = dvb_frontend_start (fe);
                 if (ret)
                         dvb_generic_release (inode, file);
 
                 /*  empty event queue */
                 fepriv->events.eventr = fepriv->events.eventw = 0;
-
-                /* normal tune mode when opened R/W */
-                fepriv->tune_mode_flags &= ~FE_TUNE_MODE_ONESHOT;
-                fepriv->tone = -1;
-                fepriv->voltage = -1;
         }
 
         return ret;
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index 3bc6722a6443..75824b77198a 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -2,6 +2,7 @@ config DVB_USB
         tristate "Support for various USB DVB devices"
         depends on DVB_CORE && USB && I2C
         select FW_LOADER
+        select DVB_PLL
         help
           By enabling this you will be able to choose the various supported
           USB1.1 and USB2.0 DVB devices.
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 0ef361f0309b..db978555b1eb 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -6,43 +6,43 @@ comment "DVB-S (satellite) frontends"
 
 config DVB_STV0299
         tristate "ST STV0299 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
 config DVB_CX24110
         tristate "Conexant CX24110 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
 config DVB_CX24123
         tristate "Conexant CX24123 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
 config DVB_TDA8083
         tristate "Philips TDA8083 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
 config DVB_MT312
         tristate "Zarlink VP310/MT312 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
 config DVB_VES1X93
         tristate "VLSI VES1893 or VES1993 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
 config DVB_S5H1420
         tristate "Samsung S5H1420 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
@@ -51,7 +51,7 @@ comment "DVB-T (terrestrial) frontends"
 
 config DVB_SP8870
         tristate "Spase sp8870 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         select FW_LOADER
         help
           A DVB-T tuner module. Say Y when you want to support this frontend.
@@ -63,7 +63,7 @@ config DVB_SP8870
 
 config DVB_SP887X
         tristate "Spase sp887x based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         select FW_LOADER
         help
           A DVB-T tuner module. Say Y when you want to support this frontend.
@@ -75,25 +75,25 @@ config DVB_SP887X
 
 config DVB_CX22700
         tristate "Conexant CX22700 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         help
           A DVB-T tuner module. Say Y when you want to support this frontend.
 
 config DVB_CX22702
         tristate "Conexant cx22702 demodulator (OFDM)"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         help
           A DVB-T tuner module. Say Y when you want to support this frontend.
 
 config DVB_L64781
         tristate "LSI L64781"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         help
           A DVB-T tuner module. Say Y when you want to support this frontend.
 
 config DVB_TDA1004X
         tristate "Philips TDA10045H/TDA10046H based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         select FW_LOADER
         help
           A DVB-T tuner module. Say Y when you want to support this frontend.
@@ -106,32 +106,32 @@ config DVB_TDA1004X
 
 config DVB_NXT6000
         tristate "NxtWave Communications NXT6000 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         help
           A DVB-T tuner module. Say Y when you want to support this frontend.
 
 config DVB_MT352
         tristate "Zarlink MT352 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         help
           A DVB-T tuner module. Say Y when you want to support this frontend.
 
 config DVB_ZL10353
         tristate "Zarlink ZL10353 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         help
           A DVB-T tuner module. Say Y when you want to support this frontend.
 
 config DVB_DIB3000MB
         tristate "DiBcom 3000M-B"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         help
           A DVB-T tuner module. Designed for mobile usage. Say Y when you want
           to support this frontend.
 
 config DVB_DIB3000MC
         tristate "DiBcom 3000P/M-C"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         help
           A DVB-T tuner module. Designed for mobile usage. Say Y when you want
           to support this frontend.
@@ -141,19 +141,19 @@ comment "DVB-C (cable) frontends"
 
 config DVB_VES1820
         tristate "VLSI VES1820 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         help
           A DVB-C tuner module. Say Y when you want to support this frontend.
 
 config DVB_TDA10021
         tristate "Philips TDA10021 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         help
           A DVB-C tuner module. Say Y when you want to support this frontend.
 
 config DVB_STV0297
         tristate "ST STV0297 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         help
           A DVB-C tuner module. Say Y when you want to support this frontend.
 
@@ -162,7 +162,7 @@ comment "ATSC (North American/Korean Terrestrial/Cable DTV) frontends"
 
 config DVB_NXT200X
         tristate "NxtWave Communications NXT2002/NXT2004 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         select FW_LOADER
         help
           An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
@@ -176,7 +176,7 @@ config DVB_NXT200X
 
 config DVB_OR51211
         tristate "Oren OR51211 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         select FW_LOADER
         help
           An ATSC 8VSB tuner module. Say Y when you want to support this frontend.
@@ -188,7 +188,7 @@ config DVB_OR51211
 
 config DVB_OR51132
         tristate "Oren OR51132 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         select FW_LOADER
         help
           An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
@@ -203,7 +203,7 @@ config DVB_OR51132
 
 config DVB_BCM3510
         tristate "Broadcom BCM3510"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         select FW_LOADER
         help
           An ATSC 8VSB/16VSB and QAM64/256 tuner module. Say Y when you want to
@@ -211,7 +211,7 @@ config DVB_BCM3510
 
 config DVB_LGDT330X
         tristate "LG Electronics LGDT3302/LGDT3303 based"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         help
           An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
           to support this frontend.
@@ -220,15 +220,19 @@ config DVB_LGDT330X
 comment "Miscellaneous devices"
         depends on DVB_CORE
 
+config DVB_PLL
+        tristate
+        depends on DVB_CORE && I2C
+
 config DVB_LNBP21
         tristate "LNBP21 SEC controller"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         help
           An SEC control chip.
 
 config DVB_ISL6421
         tristate "ISL6421 SEC controller"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         help
           An SEC control chip.
 
diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile
index 5222245c7f59..0e4880b6db14 100644
--- a/drivers/media/dvb/frontends/Makefile
+++ b/drivers/media/dvb/frontends/Makefile
@@ -4,7 +4,7 @@
 
 EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
 
-obj-$(CONFIG_DVB_CORE) += dvb-pll.o
+obj-$(CONFIG_DVB_PLL) += dvb-pll.o
 obj-$(CONFIG_DVB_STV0299) += stv0299.o
 obj-$(CONFIG_DVB_SP8870) += sp8870.o
 obj-$(CONFIG_DVB_CX22700) += cx22700.o
diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c
index a189683454b7..2be33f27c69f 100644
--- a/drivers/media/dvb/frontends/dvb-pll.c
+++ b/drivers/media/dvb/frontends/dvb-pll.c
@@ -194,11 +194,11 @@ struct dvb_pll_desc dvb_pll_tda665x = {
                 {  253834000, 36249333, 166667, 0xca, 0x62 /* 011 0 0 0  10 */ },
                 {  383834000, 36249333, 166667, 0xca, 0xa2 /* 101 0 0 0  10 */ },
                 {  443834000, 36249333, 166667, 0xca, 0xc2 /* 110 0 0 0  10 */ },
-                {  444000000, 36249333, 166667, 0xca, 0xc3 /* 110 0 0 0  11 */ },
-                {  583834000, 36249333, 166667, 0xca, 0x63 /* 011 0 0 0  11 */ },
-                {  793834000, 36249333, 166667, 0xca, 0xa3 /* 101 0 0 0  11 */ },
-                {  444834000, 36249333, 166667, 0xca, 0xc3 /* 110 0 0 0  11 */ },
-                {  861000000, 36249333, 166667, 0xca, 0xe3 /* 111 0 0 0  11 */ },
+                {  444000000, 36249333, 166667, 0xca, 0xc4 /* 110 0 0 1  00 */ },
+                {  583834000, 36249333, 166667, 0xca, 0x64 /* 011 0 0 1  00 */ },
+                {  793834000, 36249333, 166667, 0xca, 0xa4 /* 101 0 0 1  00 */ },
+                {  444834000, 36249333, 166667, 0xca, 0xc4 /* 110 0 0 1  00 */ },
+                {  861000000, 36249333, 166667, 0xca, 0xe4 /* 111 0 0 1  00 */ },
         }
 };
 EXPORT_SYMBOL(dvb_pll_tda665x);
@@ -613,7 +613,21 @@ static struct dvb_tuner_ops dvb_pll_tuner_ops = {
 
 int dvb_pll_attach(struct dvb_frontend *fe, int pll_addr, struct i2c_adapter *i2c, struct dvb_pll_desc *desc)
 {
+        u8 b1 [] = { 0 };
+        struct i2c_msg msg = { .addr = pll_addr, .flags = I2C_M_RD, .buf = b1, .len = 1 };
         struct dvb_pll_priv *priv = NULL;
+        int ret;
+
+        if (i2c != NULL) {
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 1);
+
+                ret = i2c_transfer (i2c, &msg, 1);
+                if (ret != 1)
+                        return -1;
+                if (fe->ops.i2c_gate_ctrl)
+                             fe->ops.i2c_gate_ctrl(fe, 0);
+        }
 
         priv = kzalloc(sizeof(struct dvb_pll_priv), GFP_KERNEL);
         if (priv == NULL)
diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c
index 55671cb5255e..87c286ee6a00 100644
--- a/drivers/media/dvb/frontends/nxt200x.c
+++ b/drivers/media/dvb/frontends/nxt200x.c
@@ -896,9 +896,9 @@ static int nxt2002_init(struct dvb_frontend* fe)
         }
 
         ret = nxt2002_load_firmware(fe, fw);
+        release_firmware(fw);
         if (ret) {
                 printk("nxt2002: Writing firmware to device failed\n");
-                release_firmware(fw);
                 return ret;
         }
         printk("nxt2002: Firmware upload complete\n");
@@ -960,9 +960,9 @@ static int nxt2004_init(struct dvb_frontend* fe)
         }
 
         ret = nxt2004_load_firmware(fe, fw);
+        release_firmware(fw);
         if (ret) {
                 printk("nxt2004: Writing firmware to device failed\n");
-                release_firmware(fw);
                 return ret;
         }
         printk("nxt2004: Firmware upload complete\n");
diff --git a/drivers/media/dvb/frontends/or51211.c b/drivers/media/dvb/frontends/or51211.c
index 26bed616fabe..2bf124b53689 100644
--- a/drivers/media/dvb/frontends/or51211.c
+++ b/drivers/media/dvb/frontends/or51211.c
@@ -437,10 +437,10 @@ static int or51211_init(struct dvb_frontend* fe)
                 }
 
                 ret = or51211_load_firmware(fe, fw);
+                release_firmware(fw);
                 if (ret) {
                         printk(KERN_WARNING "or51211: Writing firmware to "
                                "device failed!\n");
-                        release_firmware(fw);
                         return ret;
                 }
                 printk(KERN_INFO "or51211: Firmware upload complete.\n");
diff --git a/drivers/media/dvb/frontends/sp8870.c b/drivers/media/dvb/frontends/sp8870.c
index 44ec5b9a4695..d98fd5c2e13e 100644
--- a/drivers/media/dvb/frontends/sp8870.c
+++ b/drivers/media/dvb/frontends/sp8870.c
@@ -318,7 +318,6 @@ static int sp8870_init (struct dvb_frontend* fe)
         printk("sp8870: waiting for firmware upload (%s)...\n", SP8870_DEFAULT_FIRMWARE);
         if (state->config->request_firmware(fe, &fw, SP8870_DEFAULT_FIRMWARE)) {
                 printk("sp8870: no firmware upload (timeout or file not found?)\n");
-                release_firmware(fw);
                 return -EIO;
         }
 
@@ -327,6 +326,7 @@ static int sp8870_init (struct dvb_frontend* fe)
                 release_firmware(fw);
                 return -EIO;
         }
+        release_firmware(fw);
         printk("sp8870: firmware upload complete\n");
 
         /* enable TS output and interface pins */
diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c
index b0a2b02f6608..5c2f8f4e0ae5 100644
--- a/drivers/media/dvb/frontends/sp887x.c
+++ b/drivers/media/dvb/frontends/sp887x.c
@@ -520,9 +520,9 @@ static int sp887x_init(struct dvb_frontend* fe)
                 }
 
                 ret = sp887x_initial_setup(fe, fw);
+                release_firmware(fw);
                 if (ret) {
                         printk("sp887x: writing firmware to device failed\n");
-                        release_firmware(fw);
                         return ret;
                 }
                 printk("sp887x: firmware upload complete\n");
diff --git a/drivers/media/dvb/pluto2/Kconfig b/drivers/media/dvb/pluto2/Kconfig
index 7d8e6e87bdbb..9b84b1bdc313 100644
--- a/drivers/media/dvb/pluto2/Kconfig
+++ b/drivers/media/dvb/pluto2/Kconfig
@@ -2,6 +2,7 @@ config DVB_PLUTO2
         tristate "Pluto2 cards"
         depends on DVB_CORE && PCI && I2C
         select I2C_ALGOBIT
+        select DVB_PLL
         select DVB_TDA1004X
         help
           Support for PCI cards based on the Pluto2 FPGA like the Satelco
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index 987881fa988c..5fb097595cfb 100644
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -3,6 +3,7 @@ config DVB_AV7110
         depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
         select FW_LOADER
         select VIDEO_SAA7146_VV
+        select DVB_PLL
         select DVB_VES1820
         select DVB_VES1X93
         select DVB_STV0299
@@ -61,6 +62,7 @@ config DVB_BUDGET
         tristate "Budget cards"
         depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
         select VIDEO_SAA7146
+        select DVB_PLL
         select DVB_STV0299
         select DVB_VES1X93
         select DVB_VES1820
@@ -83,6 +85,7 @@ config DVB_BUDGET_CI
         tristate "Budget cards with onboard CI connector"
         depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
         select VIDEO_SAA7146
+        select DVB_PLL
         select DVB_STV0297
         select DVB_STV0299
         select DVB_TDA1004X
@@ -104,6 +107,7 @@ config DVB_BUDGET_AV
         tristate "Budget cards with analog video inputs"
         depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
         select VIDEO_SAA7146_VV
+        select DVB_PLL
         select DVB_STV0299
         select DVB_TDA1004X
         select DVB_TDA10021
@@ -122,6 +126,7 @@ config DVB_BUDGET_PATCH
         tristate "AV7110 cards with Budget Patch"
         depends on DVB_CORE && DVB_BUDGET && VIDEO_V4L1
         select DVB_AV7110
+        select DVB_PLL
         select DVB_STV0299
         select DVB_VES1X93
         select DVB_TDA8083
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 500f15c10aaf..4506165c5de2 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -2203,8 +2203,8 @@ static int frontend_init(struct av7110 *av7110)
                                 av7110->fe->ops.tuner_ops.set_params = nexusca_stv0297_tuner_set_params;
 
                                 /* set TDA9819 into DVB mode */
-                                saa7146_setgpio(av7110->dev, 1, SAA7146_GPIO_OUTLO); // TDA9198 pin9(STD)
-                                saa7146_setgpio(av7110->dev, 3, SAA7146_GPIO_OUTLO); // TDA9198 pin30(VIF)
+                                saa7146_setgpio(av7110->dev, 1, SAA7146_GPIO_OUTLO); // TDA9819 pin9(STD)
+                                saa7146_setgpio(av7110->dev, 3, SAA7146_GPIO_OUTLO); // TDA9819 pin30(VIF)
 
                                 /* tuner on this needs a slower i2c bus speed */
                                 av7110->dev->i2c_bitrate = SAA7146_I2C_BUS_BIT_RATE_240;
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c
index 64055461559d..6ffe53fdcf57 100644
--- a/drivers/media/dvb/ttpci/av7110_v4l.c
+++ b/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -272,8 +272,8 @@ static int av7110_dvb_c_switch(struct saa7146_fh *fh)
                                 if (ves1820_writereg(dev, 0x09, 0x0f, 0x60))
                                         dprintk(1, "setting band in demodulator failed.\n");
                         } else if (av7110->analog_tuner_flags & ANALOG_TUNER_STV0297) {
-                                saa7146_setgpio(dev, 1, SAA7146_GPIO_OUTHI); // TDA9198 pin9(STD)
-                                saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI); // TDA9198 pin30(VIF)
+                                saa7146_setgpio(dev, 1, SAA7146_GPIO_OUTHI); // TDA9819 pin9(STD)
+                                saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI); // TDA9819 pin30(VIF)
                         }
                         if (i2c_writereg(av7110, 0x48, 0x02, 0xd0) != 1)
                                 dprintk(1, "saa7113 write failed @ card %d", av7110->dvb_adapter.num);
@@ -308,8 +308,8 @@ static int av7110_dvb_c_switch(struct saa7146_fh *fh)
                         if (ves1820_writereg(dev, 0x09, 0x0f, 0x20))
                                 dprintk(1, "setting band in demodulator failed.\n");
                 } else if (av7110->analog_tuner_flags & ANALOG_TUNER_STV0297) {
-                        saa7146_setgpio(dev, 1, SAA7146_GPIO_OUTLO); // TDA9198 pin9(STD)
-                        saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO); // TDA9198 pin30(VIF)
+                        saa7146_setgpio(dev, 1, SAA7146_GPIO_OUTLO); // TDA9819 pin9(STD)
+                        saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO); // TDA9819 pin30(VIF)
                 }
         }
 
@@ -750,8 +750,8 @@ int av7110_init_analog_module(struct av7110 *av7110)
                         if (ves1820_writereg(av7110->dev, 0x09, 0x0f, 0x20))
                                 dprintk(1, "setting band in demodulator failed.\n");
                 } else if (av7110->analog_tuner_flags & ANALOG_TUNER_STV0297) {
-                        saa7146_setgpio(av7110->dev, 1, SAA7146_GPIO_OUTLO); // TDA9198 pin9(STD)
-                        saa7146_setgpio(av7110->dev, 3, SAA7146_GPIO_OUTLO); // TDA9198 pin30(VIF)
+                        saa7146_setgpio(av7110->dev, 1, SAA7146_GPIO_OUTLO); // TDA9819 pin9(STD)
+                        saa7146_setgpio(av7110->dev, 3, SAA7146_GPIO_OUTLO); // TDA9819 pin30(VIF)
                 }
 
                 /* init the saa7113 */
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index 5f111d407730..2d21fec23b4d 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -1303,6 +1303,9 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
         budget_av->budget.dvb_adapter.priv = budget_av;
         frontend_init(budget_av);
         ciintf_init(budget_av);
+
+        ttpci_budget_init_hooks(&budget_av->budget);
+
         return 0;
 }
 
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 4b966eea3834..ffbbb3e34be4 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -1101,6 +1101,8 @@ static int budget_ci_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
         budget_ci->budget.dvb_adapter.priv = budget_ci;
         frontend_init(budget_ci);
 
+        ttpci_budget_init_hooks(&budget_ci->budget);
+
         return 0;
 }
 
diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c
index e4cf7775e07f..e15562f81664 100644
--- a/drivers/media/dvb/ttpci/budget-core.c
+++ b/drivers/media/dvb/ttpci/budget-core.c
@@ -63,9 +63,6 @@ static int stop_ts_capture(struct budget *budget)
 {
         dprintk(2, "budget: %p\n", budget);
 
-        if (--budget->feeding)
-                return budget->feeding;
-
         saa7146_write(budget->dev, MC1, MASK_20);       // DMA3 off
         SAA7146_IER_DISABLE(budget->dev, MASK_10);
         return 0;
@@ -77,8 +74,8 @@ static int start_ts_capture(struct budget *budget)
 
         dprintk(2, "budget: %p\n", budget);
 
-        if (budget->feeding)
-                return ++budget->feeding;
+        if (!budget->feeding || !budget->fe_synced)
+                return 0;
 
         saa7146_write(dev, MC1, MASK_20);       // DMA3 off
 
@@ -139,7 +136,33 @@ static int start_ts_capture(struct budget *budget)
         SAA7146_IER_ENABLE(budget->dev, MASK_10);       /* VPE */
         saa7146_write(dev, MC1, (MASK_04 | MASK_20));   /* DMA3 on */
 
-        return ++budget->feeding;
+        return 0;
+}
+
+static int budget_read_fe_status(struct dvb_frontend *fe, fe_status_t *status)
+{
+        struct budget *budget = (struct budget *) fe->dvb->priv;
+        int synced;
+        int ret;
+
+        if (budget->read_fe_status)
+                ret = budget->read_fe_status(fe, status);
+        else
+                ret = -EINVAL;
+
+        if (!ret) {
+                synced = (*status & FE_HAS_LOCK);
+                if (synced != budget->fe_synced) {
+                        budget->fe_synced = synced;
+                        spin_lock(&budget->feedlock);
+                        if (synced)
+                                start_ts_capture(budget);
+                        else
+                                stop_ts_capture(budget);
+                        spin_unlock(&budget->feedlock);
+                }
+        }
+        return ret;
 }
 
 static void vpeirq(unsigned long data)
@@ -267,7 +290,7 @@ static int budget_start_feed(struct dvb_demux_feed *feed)
 {
         struct dvb_demux *demux = feed->demux;
         struct budget *budget = (struct budget *) demux->priv;
-        int status;
+        int status = 0;
 
         dprintk(2, "budget: %p\n", budget);
 
@@ -276,7 +299,8 @@ static int budget_start_feed(struct dvb_demux_feed *feed)
 
         spin_lock(&budget->feedlock);
         feed->pusi_seen = 0; /* have a clean section start */
-        status = start_ts_capture(budget);
+        if (budget->feeding++ == 0)
+                status = start_ts_capture(budget);
         spin_unlock(&budget->feedlock);
         return status;
 }
@@ -285,12 +309,13 @@ static int budget_stop_feed(struct dvb_demux_feed *feed)
 {
         struct dvb_demux *demux = feed->demux;
         struct budget *budget = (struct budget *) demux->priv;
-        int status;
+        int status = 0;
 
         dprintk(2, "budget: %p\n", budget);
 
         spin_lock(&budget->feedlock);
-        status = stop_ts_capture(budget);
+        if (--budget->feeding == 0)
+                status = stop_ts_capture(budget);
         spin_unlock(&budget->feedlock);
         return status;
 }
@@ -470,6 +495,14 @@ err:
         return ret;
 }
 
+void ttpci_budget_init_hooks(struct budget *budget)
+{
+        if (budget->dvb_frontend && !budget->read_fe_status) {
+                budget->read_fe_status = budget->dvb_frontend->ops.read_status;
+                budget->dvb_frontend->ops.read_status = budget_read_fe_status;
+        }
+}
+
 int ttpci_budget_deinit(struct budget *budget)
 {
         struct saa7146_dev *dev = budget->dev;
@@ -508,11 +541,8 @@ void ttpci_budget_set_video_port(struct saa7146_dev *dev, int video_port)
         spin_lock(&budget->feedlock);
         budget->video_port = video_port;
         if (budget->feeding) {
-                int oldfeeding = budget->feeding;
-                budget->feeding = 1;
                 stop_ts_capture(budget);
                 start_ts_capture(budget);
-                budget->feeding = oldfeeding;
         }
         spin_unlock(&budget->feedlock);
 }
@@ -520,6 +550,7 @@ void ttpci_budget_set_video_port(struct saa7146_dev *dev, int video_port)
 EXPORT_SYMBOL_GPL(ttpci_budget_debiread);
 EXPORT_SYMBOL_GPL(ttpci_budget_debiwrite);
 EXPORT_SYMBOL_GPL(ttpci_budget_init);
+EXPORT_SYMBOL_GPL(ttpci_budget_init_hooks);
 EXPORT_SYMBOL_GPL(ttpci_budget_deinit);
 EXPORT_SYMBOL_GPL(ttpci_budget_irq10_handler);
 EXPORT_SYMBOL_GPL(ttpci_budget_set_video_port);
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c
index ee60ce90a400..57227441891e 100644
--- a/drivers/media/dvb/ttpci/budget-patch.c
+++ b/drivers/media/dvb/ttpci/budget-patch.c
@@ -617,6 +617,8 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
         budget->dvb_adapter.priv = budget;
         frontend_init(budget);
 
+        ttpci_budget_init_hooks(budget);
+
         return 0;
 }
 
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index 35761f13c12b..863dffb4ed8e 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -375,9 +375,6 @@ static void frontend_init(struct budget *budget)
                 if (budget->dvb_frontend) {
                         budget->dvb_frontend->ops.tuner_ops.set_params = alps_bsru6_tuner_set_params;
                         budget->dvb_frontend->tuner_priv = &budget->i2c_adap;
-                        budget->dvb_frontend->ops.diseqc_send_master_cmd = budget_diseqc_send_master_cmd;
-                        budget->dvb_frontend->ops.diseqc_send_burst = budget_diseqc_send_burst;
-                        budget->dvb_frontend->ops.set_tone = budget_set_tone;
                         break;
                 }
                 break;
@@ -474,6 +471,8 @@ static int budget_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_
         budget->dvb_adapter.priv = budget;
         frontend_init(budget);
 
+        ttpci_budget_init_hooks(budget);
+
         return 0;
 }
 
diff --git a/drivers/media/dvb/ttpci/budget.h b/drivers/media/dvb/ttpci/budget.h
index ecea3a13030e..e8a5c79178e1 100644
--- a/drivers/media/dvb/ttpci/budget.h
+++ b/drivers/media/dvb/ttpci/budget.h
@@ -52,9 +52,6 @@ struct budget {
         struct dmx_frontend hw_frontend;
         struct dmx_frontend mem_frontend;
 
-        int fe_synced;
-        struct mutex pid_mutex;
-
         int ci_present;
         int video_port;
 
@@ -74,6 +71,9 @@ struct budget {
 
         struct dvb_adapter dvb_adapter;
         struct dvb_frontend *dvb_frontend;
+        int (*read_fe_status)(struct dvb_frontend *fe, fe_status_t *status);
+        int fe_synced;
+
         void *priv;
 };
 
@@ -106,6 +106,7 @@ static struct saa7146_pci_extension_data x_var = { \
 extern int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
                              struct saa7146_pci_extension_data *info,
                              struct module *owner);
+extern void ttpci_budget_init_hooks(struct budget *budget);
 extern int ttpci_budget_deinit(struct budget *budget);
 extern void ttpci_budget_irq10_handler(struct saa7146_dev *dev, u32 * isr);
 extern void ttpci_budget_set_video_port(struct saa7146_dev *dev, int video_port);
diff --git a/drivers/media/dvb/ttusb-budget/Kconfig b/drivers/media/dvb/ttusb-budget/Kconfig
index 92c7cdcf8981..46a6a60d2ab9 100644
--- a/drivers/media/dvb/ttusb-budget/Kconfig
+++ b/drivers/media/dvb/ttusb-budget/Kconfig
@@ -1,6 +1,7 @@
 config DVB_TTUSB_BUDGET
         tristate "Technotrend/Hauppauge Nova-USB devices"
-        depends on DVB_CORE && USB
+        depends on DVB_CORE && USB && I2C
+        select DVB_PLL
         select DVB_CX22700
         select DVB_TDA1004X
         select DVB_VES1820