15 files changed, 173 insertions, 240 deletions

diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c
index 8222b88cb486..d4b97989e3ed 100644
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -1,7 +1,7 @@
 /*
     cx24110 - Single Chip Satellite Channel Receiver driver module
 
-    Copyright (C) 2002 Peter Hettkamp <peter.hettkamp@t-online.de> based on
+    Copyright (C) 2002 Peter Hettkamp <peter.hettkamp@htp-tel.de> based on
     work
     Copyright (C) 1999 Convergence Integrated Media GmbH <ralph@convergence.de>
 
@@ -387,8 +387,9 @@ static int cx24110_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltag
 
 static int cx24110_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t burst)
 {
-        int rv, bit, i;
+        int rv, bit;
         struct cx24110_state *state = fe->demodulator_priv;
+        unsigned long timeout;
 
         if (burst == SEC_MINI_A)
                 bit = 0x00;
@@ -398,12 +399,14 @@ static int cx24110_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t
                 return -EINVAL;
 
         rv = cx24110_readreg(state, 0x77);
-        cx24110_writereg(state, 0x77, rv|0x04);
+        if (!(rv & 0x04))
+                cx24110_writereg(state, 0x77, rv | 0x04);
 
         rv = cx24110_readreg(state, 0x76);
         cx24110_writereg(state, 0x76, ((rv & 0x90) | 0x40 | bit));
-        for (i = 500; i-- > 0 && !(cx24110_readreg(state,0x76)&0x40) ; )
-              ; /* wait for LNB ready */
+        timeout = jiffies + msecs_to_jiffies(100);
+        while (!time_after(jiffies, timeout) && !(cx24110_readreg(state, 0x76) & 0x40))
+                ; /* wait for LNB ready */
 
         return 0;
 }
@@ -413,17 +416,22 @@ static int cx24110_send_diseqc_msg(struct dvb_frontend* fe,
 {
         int i, rv;
         struct cx24110_state *state = fe->demodulator_priv;
+        unsigned long timeout;
 
         for (i = 0; i < cmd->msg_len; i++)
                 cx24110_writereg(state, 0x79 + i, cmd->msg[i]);
 
         rv = cx24110_readreg(state, 0x77);
-        cx24110_writereg(state, 0x77, rv|0x04);
+        if (rv & 0x04) {
+                cx24110_writereg(state, 0x77, rv & ~0x04);
+                msleep(30); /* reportedly fixes switching problems */
+        }
 
         rv = cx24110_readreg(state, 0x76);
 
         cx24110_writereg(state, 0x76, ((rv & 0x90) | 0x40) | ((cmd->msg_len-3) & 3));
-        for (i=500; i-- > 0 && !(cx24110_readreg(state,0x76)&0x40);)
+        timeout = jiffies + msecs_to_jiffies(100);
+        while (!time_after(jiffies, timeout) && !(cx24110_readreg(state, 0x76) & 0x40))
                 ; /* wait for LNB ready */
 
         return 0;
diff --git a/drivers/media/dvb/frontends/cx24110.h b/drivers/media/dvb/frontends/cx24110.h
index 6b663f4744e0..b63ecf26421a 100644
--- a/drivers/media/dvb/frontends/cx24110.h
+++ b/drivers/media/dvb/frontends/cx24110.h
@@ -1,7 +1,7 @@
 /*
     cx24110 - Single Chip Satellite Channel Receiver driver module
 
-    Copyright (C) 2002 Peter Hettkamp <peter.hettkamp@t-online.de> based on
+    Copyright (C) 2002 Peter Hettkamp <peter.hettkamp@htp-tel.de> based on
     work
     Copyright (C) 1999 Convergence Integrated Media GmbH <ralph@convergence.de>
 
diff --git a/drivers/media/dvb/frontends/dib3000mb.c b/drivers/media/dvb/frontends/dib3000mb.c
index cd434b7cf9db..21433e1831e7 100644
--- a/drivers/media/dvb/frontends/dib3000mb.c
+++ b/drivers/media/dvb/frontends/dib3000mb.c
@@ -23,7 +23,6 @@
 
 #include <linux/config.h>
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c
index cd33705a4320..441de665fec3 100644
--- a/drivers/media/dvb/frontends/dib3000mc.c
+++ b/drivers/media/dvb/frontends/dib3000mc.c
@@ -22,7 +22,6 @@
  */
 #include <linux/config.h>
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
diff --git a/drivers/media/dvb/frontends/mt352.c b/drivers/media/dvb/frontends/mt352.c
index d32dc4de9e7f..cc1bc0edd65e 100644
--- a/drivers/media/dvb/frontends/mt352.c
+++ b/drivers/media/dvb/frontends/mt352.c
@@ -462,9 +462,11 @@ static int mt352_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 {
         struct mt352_state* state = fe->demodulator_priv;
 
-        u16 signal = ((mt352_read_register(state, AGC_GAIN_1) << 8) & 0x0f) |
-                      (mt352_read_register(state, AGC_GAIN_0));
+        /* align the 12 bit AGC gain with the most significant bits */
+        u16 signal = ((mt352_read_register(state, AGC_GAIN_1) & 0x0f) << 12) |
+                (mt352_read_register(state, AGC_GAIN_0) << 4);
 
+        /* inverse of gain is signal strength */
         *strength = ~signal;
         return 0;
 }
diff --git a/drivers/media/dvb/frontends/nxt6000.c b/drivers/media/dvb/frontends/nxt6000.c
index 966de9853d18..88a57b791112 100644
--- a/drivers/media/dvb/frontends/nxt6000.c
+++ b/drivers/media/dvb/frontends/nxt6000.c
@@ -482,6 +482,7 @@ static int nxt6000_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
         if ((result = nxt6000_set_inversion(state, param->inversion)) < 0)
                 return result;
 
+        msleep(500);
         return 0;
 }
 
@@ -525,6 +526,12 @@ static int nxt6000_read_signal_strength(struct dvb_frontend* fe, u16* signal_str
         return 0;
 }
 
+static int nxt6000_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *tune)
+{
+        tune->min_delay_ms = 500;
+        return 0;
+}
+
 static struct dvb_frontend_ops nxt6000_ops;
 
 struct dvb_frontend* nxt6000_attach(const struct nxt6000_config* config,
@@ -578,6 +585,8 @@ static struct dvb_frontend_ops nxt6000_ops = {
 
         .init = nxt6000_init,
 
+        .get_tune_settings = nxt6000_fe_get_tune_settings,
+
         .set_frontend = nxt6000_set_frontend,
 
         .read_status = nxt6000_read_status,
diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c
index cc0a77c790f1..b6d0eecc59eb 100644
--- a/drivers/media/dvb/frontends/or51132.c
+++ b/drivers/media/dvb/frontends/or51132.c
@@ -370,22 +370,19 @@ static int or51132_set_parameters(struct dvb_frontend* fe,
                 or51132_setmode(fe);
         }
 
-        /* Change only if we are actually changing the channel */
-        if (state->current_frequency != param->frequency) {
-                dvb_pll_configure(state->config->pll_desc, buf,
-                                  param->frequency, 0);
-                dprintk("set_parameters tuner bytes: 0x%02x 0x%02x "
-                        "0x%02x 0x%02x\n",buf[0],buf[1],buf[2],buf[3]);
-                if (i2c_writebytes(state, state->config->pll_address ,buf, 4))
-                        printk(KERN_WARNING "or51132: set_parameters error "
-                               "writing to tuner\n");
-
-                /* Set to current mode */
-                or51132_setmode(fe);
-
-                /* Update current frequency */
-                state->current_frequency = param->frequency;
-        }
+        dvb_pll_configure(state->config->pll_desc, buf,
+                          param->frequency, 0);
+        dprintk("set_parameters tuner bytes: 0x%02x 0x%02x "
+                "0x%02x 0x%02x\n",buf[0],buf[1],buf[2],buf[3]);
+        if (i2c_writebytes(state, state->config->pll_address ,buf, 4))
+                printk(KERN_WARNING "or51132: set_parameters error "
+                       "writing to tuner\n");
+
+        /* Set to current mode */
+        or51132_setmode(fe);
+
+        /* Update current frequency */
+        state->current_frequency = param->frequency;
         return 0;
 }
 
diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c
index 4f396ac8de77..c7fe27fd530c 100644
--- a/drivers/media/dvb/frontends/s5h1420.c
+++ b/drivers/media/dvb/frontends/s5h1420.c
@@ -48,7 +48,8 @@ struct s5h1420_state {
 };
 
 static u32 s5h1420_getsymbolrate(struct s5h1420_state* state);
-static int s5h1420_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings);
+static int s5h1420_get_tune_settings(struct dvb_frontend* fe,
+                                     struct dvb_frontend_tune_settings* fesettings);
 
 
 static int debug = 0;
@@ -91,7 +92,8 @@ static int s5h1420_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltag
 
         switch(voltage) {
         case SEC_VOLTAGE_13:
-                s5h1420_writereg(state, 0x3c, (s5h1420_readreg(state, 0x3c) & 0xfe) | 0x02);
+                s5h1420_writereg(state, 0x3c,
+                                 (s5h1420_readreg(state, 0x3c) & 0xfe) | 0x02);
                 break;
 
         case SEC_VOLTAGE_18:
@@ -112,18 +114,21 @@ static int s5h1420_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 
         switch(tone) {
         case SEC_TONE_ON:
-                s5h1420_writereg(state, 0x3b, (s5h1420_readreg(state, 0x3b) & 0x74) | 0x08);
+                s5h1420_writereg(state, 0x3b,
+                                 (s5h1420_readreg(state, 0x3b) & 0x74) | 0x08);
                 break;
 
         case SEC_TONE_OFF:
-                s5h1420_writereg(state, 0x3b, (s5h1420_readreg(state, 0x3b) & 0x74) | 0x01);
+                s5h1420_writereg(state, 0x3b,
+                                 (s5h1420_readreg(state, 0x3b) & 0x74) | 0x01);
                 break;
         }
 
         return 0;
 }
 
-static int s5h1420_send_master_cmd (struct dvb_frontend* fe, struct dvb_diseqc_master_cmd* cmd)
+static int s5h1420_send_master_cmd (struct dvb_frontend* fe,
+                                    struct dvb_diseqc_master_cmd* cmd)
 {
         struct s5h1420_state* state = fe->demodulator_priv;
         u8 val;
@@ -131,6 +136,9 @@ static int s5h1420_send_master_cmd (struct dvb_frontend* fe, struct dvb_diseqc_m
         unsigned long timeout;
         int result = 0;
 
+        if (cmd->msg_len > 8)
+                return -EINVAL;
+
         /* setup for DISEQC */
         val = s5h1420_readreg(state, 0x3b);
         s5h1420_writereg(state, 0x3b, 0x02);
@@ -138,16 +146,17 @@ static int s5h1420_send_master_cmd (struct dvb_frontend* fe, struct dvb_diseqc_m
 
         /* write the DISEQC command bytes */
         for(i=0; i< cmd->msg_len; i++) {
-                s5h1420_writereg(state, 0x3c + i, cmd->msg[i]);
+                s5h1420_writereg(state, 0x3d + i, cmd->msg[i]);
         }
 
         /* kick off transmission */
-        s5h1420_writereg(state, 0x3b, s5h1420_readreg(state, 0x3b) | ((cmd->msg_len-1) << 4) | 0x08);
+        s5h1420_writereg(state, 0x3b, s5h1420_readreg(state, 0x3b) |
+                                      ((cmd->msg_len-1) << 4) | 0x08);
 
         /* wait for transmission to complete */
         timeout = jiffies + ((100*HZ) / 1000);
         while(time_before(jiffies, timeout)) {
-                if (s5h1420_readreg(state, 0x3b) & 0x08)
+                if (!(s5h1420_readreg(state, 0x3b) & 0x08))
                         break;
 
                 msleep(5);
@@ -161,7 +170,8 @@ static int s5h1420_send_master_cmd (struct dvb_frontend* fe, struct dvb_diseqc_m
         return result;
 }
 
-static int s5h1420_recv_slave_reply (struct dvb_frontend* fe, struct dvb_diseqc_slave_reply* reply)
+static int s5h1420_recv_slave_reply (struct dvb_frontend* fe,
+                                     struct dvb_diseqc_slave_reply* reply)
 {
         struct s5h1420_state* state = fe->demodulator_priv;
         u8 val;
@@ -205,7 +215,7 @@ static int s5h1420_recv_slave_reply (struct dvb_frontend* fe, struct dvb_diseqc_
 
         /* extract data */
         for(i=0; i< length; i++) {
-                reply->msg[i] = s5h1420_readreg(state, 0x3c + i);
+                reply->msg[i] = s5h1420_readreg(state, 0x3d + i);
         }
 
 exit:
@@ -236,7 +246,7 @@ static int s5h1420_send_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t minicm
         s5h1420_writereg(state, 0x3b, s5h1420_readreg(state, 0x3b) | 0x08);
 
         /* wait for transmission to complete */
-        timeout = jiffies + ((20*HZ) / 1000);
+        timeout = jiffies + ((100*HZ) / 1000);
         while(time_before(jiffies, timeout)) {
                 if (!(s5h1420_readreg(state, 0x3b) & 0x08))
                         break;
@@ -259,9 +269,9 @@ static fe_status_t s5h1420_get_status_bits(struct s5h1420_state* state)
 
         val = s5h1420_readreg(state, 0x14);
         if (val & 0x02)
-                status |=  FE_HAS_SIGNAL; // FIXME: not sure if this is right
+                status |=  FE_HAS_SIGNAL;
         if (val & 0x01)
-                status |=  FE_HAS_CARRIER; // FIXME: not sure if this is right
+                status |=  FE_HAS_CARRIER;
         val = s5h1420_readreg(state, 0x36);
         if (val & 0x01)
                 status |=  FE_HAS_VITERBI;
@@ -284,8 +294,8 @@ static int s5h1420_read_status(struct dvb_frontend* fe, fe_status_t* status)
         /* determine lock state */
         *status = s5h1420_get_status_bits(state);
 
-        /* fix for FEC 5/6 inversion issue - if it doesn't quite lock, invert the inversion,
-        wait a bit and check again */
+        /* fix for FEC 5/6 inversion issue - if it doesn't quite lock, invert
+        the inversion, wait a bit and check again */
         if (*status == (FE_HAS_SIGNAL|FE_HAS_CARRIER|FE_HAS_VITERBI)) {
                 val = s5h1420_readreg(state, 0x32);
                 if ((val & 0x07) == 0x03) {
@@ -330,6 +340,10 @@ static int s5h1420_read_status(struct dvb_frontend* fe, fe_status_t* status)
                         tmp = (tmp * 2 * 7) / 8;
                         break;
                 }
+                if (tmp == 0) {
+                        printk("s5h1420: avoided division by 0\n");
+                        tmp = 1;
+                }
                 tmp = state->fclk / tmp;
 
                 /* set the MPEG_CLK_INTL for the calculated data rate */
@@ -368,16 +382,21 @@ static int s5h1420_read_ber(struct dvb_frontend* fe, u32* ber)
 
         s5h1420_writereg(state, 0x46, 0x1d);
         mdelay(25);
-        return (s5h1420_readreg(state, 0x48) << 8) | s5h1420_readreg(state, 0x47);
+
+        *ber = (s5h1420_readreg(state, 0x48) << 8) | s5h1420_readreg(state, 0x47);
+
+        return 0;
 }
 
 static int s5h1420_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 {
         struct s5h1420_state* state = fe->demodulator_priv;
 
-        u8 val = 0xff - s5h1420_readreg(state, 0x15);
+        u8 val = s5h1420_readreg(state, 0x15);
 
-        return (int) ((val << 8) | val);
+        *strength =  (u16) ((val << 8) | val);
+
+        return 0;
 }
 
 static int s5h1420_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
@@ -386,7 +405,10 @@ static int s5h1420_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 
         s5h1420_writereg(state, 0x46, 0x1f);
         mdelay(25);
-        return (s5h1420_readreg(state, 0x48) << 8) | s5h1420_readreg(state, 0x47);
+
+        *ucblocks = (s5h1420_readreg(state, 0x48) << 8) | s5h1420_readreg(state, 0x47);
+
+        return 0;
 }
 
 static void s5h1420_reset(struct s5h1420_state* state)
@@ -396,11 +418,12 @@ static void s5h1420_reset(struct s5h1420_state* state)
         udelay(10);
 }
 
-static void s5h1420_setsymbolrate(struct s5h1420_state* state, struct dvb_frontend_parameters *p)
+static void s5h1420_setsymbolrate(struct s5h1420_state* state,
+                                  struct dvb_frontend_parameters *p)
 {
         u64 val;
 
-        val = (p->u.qpsk.symbol_rate / 1000) * (1<<24);
+        val = ((u64) p->u.qpsk.symbol_rate / 1000ULL) * (1ULL<<24);
         if (p->u.qpsk.symbol_rate <= 21000000) {
                 val *= 2;
         }
@@ -415,7 +438,7 @@ static void s5h1420_setsymbolrate(struct s5h1420_state* state, struct dvb_fronte
 
 static u32 s5h1420_getsymbolrate(struct s5h1420_state* state)
 {
-        u64 val;
+        u64 val = 0;
         int sampling = 2;
 
         if (s5h1420_readreg(state, 0x05) & 0x2)
@@ -427,10 +450,10 @@ static u32 s5h1420_getsymbolrate(struct s5h1420_state* state)
         val |= s5h1420_readreg(state, 0x13);
         s5h1420_writereg(state, 0x06, s5h1420_readreg(state, 0x06) & 0xf7);
 
-        val *= (state->fclk / 1000);
+        val *= (state->fclk / 1000ULL);
         do_div(val, ((1<<24) * sampling));
 
-        return (u32) (val * 1000);
+        return (u32) (val * 1000ULL);
 }
 
 static void s5h1420_setfreqoffset(struct s5h1420_state* state, int freqoffset)
@@ -463,46 +486,55 @@ static int s5h1420_getfreqoffset(struct s5h1420_state* state)
 
         /* remember freqoffset is in kHz, but the chip wants the offset in Hz, so
          * divide fclk by 1000000 to get the correct value. */
-        val = - ((val * (state->fclk/1000000)) / (1<<24));
+        val = (((-val) * (state->fclk/1000000)) / (1<<24));
 
         return val;
 }
 
-static void s5h1420_setfec(struct s5h1420_state* state, struct dvb_frontend_parameters *p)
+static void s5h1420_setfec_inversion(struct s5h1420_state* state,
+                                     struct dvb_frontend_parameters *p)
 {
+        u8 inversion = 0;
+
+        if (p->inversion == INVERSION_OFF) {
+                inversion = state->config->invert ? 0x08 : 0;
+        } else if (p->inversion == INVERSION_ON) {
+                inversion = state->config->invert ? 0 : 0x08;
+        }
+
         if ((p->u.qpsk.fec_inner == FEC_AUTO) || (p->inversion == INVERSION_AUTO)) {
-                s5h1420_writereg(state, 0x31, 0x00);
                 s5h1420_writereg(state, 0x30, 0x3f);
+                s5h1420_writereg(state, 0x31, 0x00 | inversion);
         } else {
                 switch(p->u.qpsk.fec_inner) {
                 case FEC_1_2:
-                        s5h1420_writereg(state, 0x31, 0x10);
                         s5h1420_writereg(state, 0x30, 0x01);
+                        s5h1420_writereg(state, 0x31, 0x10 | inversion);
                         break;
 
                 case FEC_2_3:
-                        s5h1420_writereg(state, 0x31, 0x11);
                         s5h1420_writereg(state, 0x30, 0x02);
+                        s5h1420_writereg(state, 0x31, 0x11 | inversion);
                         break;
 
                 case FEC_3_4:
-                        s5h1420_writereg(state, 0x31, 0x12);
                         s5h1420_writereg(state, 0x30, 0x04);
-                        break;
+                        s5h1420_writereg(state, 0x31, 0x12 | inversion);
+                        break;
 
                 case FEC_5_6:
-                        s5h1420_writereg(state, 0x31, 0x13);
                         s5h1420_writereg(state, 0x30, 0x08);
+                        s5h1420_writereg(state, 0x31, 0x13 | inversion);
                         break;
 
                 case FEC_6_7:
-                        s5h1420_writereg(state, 0x31, 0x14);
                         s5h1420_writereg(state, 0x30, 0x10);
+                        s5h1420_writereg(state, 0x31, 0x14 | inversion);
                         break;
 
                 case FEC_7_8:
-                        s5h1420_writereg(state, 0x31, 0x15);
                         s5h1420_writereg(state, 0x30, 0x20);
+                        s5h1420_writereg(state, 0x31, 0x15 | inversion);
                         break;
 
                 default:
@@ -536,22 +568,6 @@ static fe_code_rate_t s5h1420_getfec(struct s5h1420_state* state)
         return FEC_NONE;
 }
 
-static void s5h1420_setinversion(struct s5h1420_state* state, struct dvb_frontend_parameters *p)
-{
-        if ((p->u.qpsk.fec_inner == FEC_AUTO) || (p->inversion == INVERSION_AUTO)) {
-                s5h1420_writereg(state, 0x31, 0x00);
-                s5h1420_writereg(state, 0x30, 0x3f);
-        } else {
-                u8 tmp = s5h1420_readreg(state, 0x31) & 0xf7;
-                        tmp |= 0x10;
-
-                if (p->inversion == INVERSION_ON)
-                        tmp |= 0x80;
-
-                s5h1420_writereg(state, 0x31, tmp);
-        }
-}
-
 static fe_spectral_inversion_t s5h1420_getinversion(struct s5h1420_state* state)
 {
         if (s5h1420_readreg(state, 0x32) & 0x08)
@@ -560,35 +576,35 @@ static fe_spectral_inversion_t s5h1420_getinversion(struct s5h1420_state* state)
         return INVERSION_OFF;
 }
 
-static int s5h1420_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
+static int s5h1420_set_frontend(struct dvb_frontend* fe,
+                                struct dvb_frontend_parameters *p)
 {
         struct s5h1420_state* state = fe->demodulator_priv;
-        u32 frequency_delta;
+        int frequency_delta;
         struct dvb_frontend_tune_settings fesettings;
+        u32 tmp;
 
         /* check if we should do a fast-tune */
         memcpy(&fesettings.parameters, p, sizeof(struct dvb_frontend_parameters));
         s5h1420_get_tune_settings(fe, &fesettings);
         frequency_delta = p->frequency - state->tunedfreq;
-        if ((frequency_delta > -fesettings.max_drift) && (frequency_delta < fesettings.max_drift) &&
+        if ((frequency_delta > -fesettings.max_drift) &&
+            (frequency_delta < fesettings.max_drift) &&
             (frequency_delta != 0) &&
             (state->fec_inner == p->u.qpsk.fec_inner) &&
             (state->symbol_rate == p->u.qpsk.symbol_rate)) {
 
-                s5h1420_setfreqoffset(state, frequency_delta);
+                if (state->config->pll_set) {
+                        s5h1420_writereg (state, 0x02, s5h1420_readreg(state,0x02) | 1);
+                        state->config->pll_set(fe, p, &tmp);
+                        s5h1420_setfreqoffset(state, p->frequency - tmp);
+                }
                 return 0;
         }
 
         /* first of all, software reset */
         s5h1420_reset(state);
 
-        /* set tuner PLL */
-        if (state->config->pll_set) {
-                s5h1420_writereg (state, 0x02, s5h1420_readreg(state,0x02) | 1);
-                state->config->pll_set(fe, p, &state->tunedfreq);
-                s5h1420_writereg (state, 0x02, s5h1420_readreg(state,0x02) & 0xfe);
-        }
-
         /* set s5h1420 fclk PLL according to desired symbol rate */
         if (p->u.qpsk.symbol_rate > 28000000) {
                 state->fclk = 88000000;
@@ -609,8 +625,9 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 
         /* set misc registers */
         s5h1420_writereg(state, 0x02, 0x00);
+        s5h1420_writereg(state, 0x06, 0x00);
         s5h1420_writereg(state, 0x07, 0xb0);
-        s5h1420_writereg(state, 0x0a, 0x67);
+        s5h1420_writereg(state, 0x0a, 0xe7);
         s5h1420_writereg(state, 0x0b, 0x78);
         s5h1420_writereg(state, 0x0c, 0x48);
         s5h1420_writereg(state, 0x0d, 0x6b);
@@ -626,21 +643,26 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
         /* start QPSK */
         s5h1420_writereg(state, 0x05, s5h1420_readreg(state, 0x05) | 1);
 
-        /* set the frequency offset to adjust for PLL inaccuracy */
-        s5h1420_setfreqoffset(state, p->frequency - state->tunedfreq);
+        /* set tuner PLL */
+        if (state->config->pll_set) {
+                s5h1420_writereg (state, 0x02, s5h1420_readreg(state,0x02) | 1);
+                state->config->pll_set(fe, p, &tmp);
+                s5h1420_setfreqoffset(state, 0);
+        }
 
         /* set the reset of the parameters */
         s5h1420_setsymbolrate(state, p);
-        s5h1420_setinversion(state, p);
-        s5h1420_setfec(state, p);
+        s5h1420_setfec_inversion(state, p);
 
         state->fec_inner = p->u.qpsk.fec_inner;
         state->symbol_rate = p->u.qpsk.symbol_rate;
         state->postlocked = 0;
+        state->tunedfreq = p->frequency;
         return 0;
 }
 
-static int s5h1420_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
+static int s5h1420_get_frontend(struct dvb_frontend* fe,
+                                struct dvb_frontend_parameters *p)
 {
         struct s5h1420_state* state = fe->demodulator_priv;
 
@@ -652,7 +674,8 @@ static int s5h1420_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
         return 0;
 }
 
-static int s5h1420_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings)
+static int s5h1420_get_tune_settings(struct dvb_frontend* fe,
+                                     struct dvb_frontend_tune_settings* fesettings)
 {
         if (fesettings->parameters.u.qpsk.symbol_rate > 20000000) {
                 fesettings->min_delay_ms = 50;
@@ -717,7 +740,8 @@ static void s5h1420_release(struct dvb_frontend* fe)
 
 static struct dvb_frontend_ops s5h1420_ops;
 
-struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config, struct i2c_adapter* i2c)
+struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config,
+                                    struct i2c_adapter* i2c)
 {
         struct s5h1420_state* state = NULL;
         u8 identity;
diff --git a/drivers/media/dvb/frontends/s5h1420.h b/drivers/media/dvb/frontends/s5h1420.h
index b687fc77ceb3..872028ddf2a2 100644
--- a/drivers/media/dvb/frontends/s5h1420.h
+++ b/drivers/media/dvb/frontends/s5h1420.h
@@ -30,6 +30,9 @@ struct s5h1420_config
         /* the demodulator's i2c address */
         u8 demod_address;
 
+        /* does the inversion require inversion? */
+        u8 invert:1;
+
         /* PLL maintenance */
         int (*pll_init)(struct dvb_frontend* fe);
         int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u32* freqout);
diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c
index 928aca052afe..8d09afd7545d 100644
--- a/drivers/media/dvb/frontends/stv0297.c
+++ b/drivers/media/dvb/frontends/stv0297.c
@@ -35,7 +35,6 @@ struct stv0297_state {
         struct dvb_frontend frontend;
 
         unsigned long base_freq;
-        u8 pwm;
 };
 
 #if 1
@@ -46,94 +45,6 @@ struct stv0297_state {
 
 #define STV0297_CLOCK_KHZ   28900
 
-static u8 init_tab[] = {
-        0x00, 0x09,
-        0x01, 0x69,
-        0x03, 0x00,
-        0x04, 0x00,
-        0x07, 0x00,
-        0x08, 0x00,
-        0x20, 0x00,
-        0x21, 0x40,
-        0x22, 0x00,
-        0x23, 0x00,
-        0x24, 0x40,
-        0x25, 0x88,
-        0x30, 0xff,
-        0x31, 0x00,
-        0x32, 0xff,
-        0x33, 0x00,
-        0x34, 0x50,
-        0x35, 0x7f,
-        0x36, 0x00,
-        0x37, 0x20,
-        0x38, 0x00,
-        0x40, 0x1c,
-        0x41, 0xff,
-        0x42, 0x29,
-        0x43, 0x00,
-        0x44, 0xff,
-        0x45, 0x00,
-        0x46, 0x00,
-        0x49, 0x04,
-        0x4a, 0xff,
-        0x4b, 0x7f,
-        0x52, 0x30,
-        0x55, 0xae,
-        0x56, 0x47,
-        0x57, 0xe1,
-        0x58, 0x3a,
-        0x5a, 0x1e,
-        0x5b, 0x34,
-        0x60, 0x00,
-        0x63, 0x00,
-        0x64, 0x00,
-        0x65, 0x00,
-        0x66, 0x00,
-        0x67, 0x00,
-        0x68, 0x00,
-        0x69, 0x00,
-        0x6a, 0x02,
-        0x6b, 0x00,
-        0x70, 0xff,
-        0x71, 0x00,
-        0x72, 0x00,
-        0x73, 0x00,
-        0x74, 0x0c,
-        0x80, 0x00,
-        0x81, 0x00,
-        0x82, 0x00,
-        0x83, 0x00,
-        0x84, 0x04,
-        0x85, 0x80,
-        0x86, 0x24,
-        0x87, 0x78,
-        0x88, 0x00,
-        0x89, 0x00,
-        0x90, 0x01,
-        0x91, 0x01,
-        0xa0, 0x00,
-        0xa1, 0x00,
-        0xa2, 0x00,
-        0xb0, 0x91,
-        0xb1, 0x0b,
-        0xc0, 0x53,
-        0xc1, 0x70,
-        0xc2, 0x12,
-        0xd0, 0x00,
-        0xd1, 0x00,
-        0xd2, 0x00,
-        0xd3, 0x00,
-        0xd4, 0x00,
-        0xd5, 0x00,
-        0xde, 0x00,
-        0xdf, 0x00,
-        0x61, 0x49,
-        0x62, 0x0b,
-        0x53, 0x08,
-        0x59, 0x08,
-};
-
 
 static int stv0297_writereg(struct stv0297_state *state, u8 reg, u8 data)
 {
@@ -378,34 +289,9 @@ static int stv0297_init(struct dvb_frontend *fe)
         struct stv0297_state *state = fe->demodulator_priv;
         int i;
 
-        /* soft reset */
-        stv0297_writereg_mask(state, 0x80, 1, 1);
-        stv0297_writereg_mask(state, 0x80, 1, 0);
-
-        /* reset deinterleaver */
-        stv0297_writereg_mask(state, 0x81, 1, 1);
-        stv0297_writereg_mask(state, 0x81, 1, 0);
-
         /* load init table */
-        for (i = 0; i < sizeof(init_tab); i += 2) {
-                stv0297_writereg(state, init_tab[i], init_tab[i + 1]);
-        }
-
-        /* set a dummy symbol rate */
-        stv0297_set_symbolrate(state, 6900);
-
-        /* invert AGC1 polarity */
-        stv0297_writereg_mask(state, 0x88, 0x10, 0x10);
-
-        /* setup bit error counting */
-        stv0297_writereg_mask(state, 0xA0, 0x80, 0x00);
-        stv0297_writereg_mask(state, 0xA0, 0x10, 0x00);
-        stv0297_writereg_mask(state, 0xA0, 0x08, 0x00);
-        stv0297_writereg_mask(state, 0xA0, 0x07, 0x04);
-
-        /* min + max PWM */
-        stv0297_writereg(state, 0x4a, 0x00);
-        stv0297_writereg(state, 0x4b, state->pwm);
+        for (i=0; !(state->config->inittab[i] == 0xff && state->config->inittab[i+1] == 0xff); i+=2)
+                stv0297_writereg(state, state->config->inittab[i], state->config->inittab[i+1]);
         msleep(200);
 
         if (state->config->pll_init)
@@ -606,7 +492,13 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
         stv0297_set_inversion(state, inversion);
 
         /* kick off lock */
-        stv0297_writereg_mask(state, 0x88, 0x08, 0x08);
+        /* Disable corner detection for higher QAMs */
+        if (p->u.qam.modulation == QAM_128 ||
+                p->u.qam.modulation == QAM_256)
+                stv0297_writereg_mask(state, 0x88, 0x08, 0x00);
+        else
+                stv0297_writereg_mask(state, 0x88, 0x08, 0x08);
+
         stv0297_writereg_mask(state, 0x5a, 0x20, 0x00);
         stv0297_writereg_mask(state, 0x6a, 0x01, 0x01);
         stv0297_writereg_mask(state, 0x43, 0x40, 0x40);
@@ -732,7 +624,7 @@ static void stv0297_release(struct dvb_frontend *fe)
 static struct dvb_frontend_ops stv0297_ops;
 
 struct dvb_frontend *stv0297_attach(const struct stv0297_config *config,
-                                    struct i2c_adapter *i2c, int pwm)
+                                    struct i2c_adapter *i2c)
 {
         struct stv0297_state *state = NULL;
 
@@ -746,7 +638,6 @@ struct dvb_frontend *stv0297_attach(const struct stv0297_config *config,
         state->i2c = i2c;
         memcpy(&state->ops, &stv0297_ops, sizeof(struct dvb_frontend_ops));
         state->base_freq = 0;
-        state->pwm = pwm;
 
         /* check if the demod is there */
         if ((stv0297_readreg(state, 0x80) & 0x70) != 0x20)
diff --git a/drivers/media/dvb/frontends/stv0297.h b/drivers/media/dvb/frontends/stv0297.h
index 3be535989302..9e53f019db71 100644
--- a/drivers/media/dvb/frontends/stv0297.h
+++ b/drivers/media/dvb/frontends/stv0297.h
@@ -29,6 +29,12 @@ struct stv0297_config
         /* the demodulator's i2c address */
         u8 demod_address;
 
+        /* inittab - array of pairs of values.
+        * First of each pair is the register, second is the value.
+        * List should be terminated with an 0xff, 0xff pair.
+        */
+        u8* inittab;
+
         /* does the "inversion" need inverted? */
         u8 invert:1;
 
@@ -38,7 +44,7 @@ struct stv0297_config
 };
 
 extern struct dvb_frontend* stv0297_attach(const struct stv0297_config* config,
-                                           struct i2c_adapter* i2c, int pwm);
+                                           struct i2c_adapter* i2c);
 extern int stv0297_enable_plli2c(struct dvb_frontend* fe);
 
 #endif // STV0297_H
diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c
index cfa3928bb487..2d62931f20b5 100644
--- a/drivers/media/dvb/frontends/stv0299.c
+++ b/drivers/media/dvb/frontends/stv0299.c
@@ -63,12 +63,8 @@ struct stv0299_state {
         u32 tuner_frequency;
         u32 symbol_rate;
         fe_code_rate_t fec_inner;
-        int errmode;
 };
 
-#define STATUS_BER 0
-#define STATUS_UCBLOCKS 1
-
 static int debug;
 static int debug_legacy_dish_switch;
 #define dprintk(args...) \
@@ -481,7 +477,7 @@ static int stv0299_init (struct dvb_frontend* fe)
 
         if (state->config->pll_init) {
                 stv0299_writeregI(state, 0x05, 0xb5);   /*  enable i2c repeater on stv0299  */
-                state->config->pll_init(fe);
+                state->config->pll_init(fe, state->i2c);
                 stv0299_writeregI(state, 0x05, 0x35);   /*  disable i2c repeater on stv0299  */
         }
 
@@ -520,7 +516,8 @@ static int stv0299_read_ber(struct dvb_frontend* fe, u32* ber)
 {
         struct stv0299_state* state = fe->demodulator_priv;
 
-        if (state->errmode != STATUS_BER) return 0;
+        stv0299_writeregI(state, 0x34, (stv0299_readreg(state, 0x34) & 0xcf) | 0x10);
+        msleep(100);
         *ber = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e);
 
         return 0;
@@ -559,8 +556,9 @@ static int stv0299_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
 {
         struct stv0299_state* state = fe->demodulator_priv;
 
-        if (state->errmode != STATUS_UCBLOCKS) *ucblocks = 0;
-        else *ucblocks = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e);
+        stv0299_writeregI(state, 0x34, (stv0299_readreg(state, 0x34) & 0xcf) | 0x30);
+        msleep(100);
+        *ucblocks = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e);
 
         return 0;
 }
@@ -603,7 +601,7 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
                 } else {
                         /* A "normal" tune is requested */
                         stv0299_writeregI(state, 0x05, 0xb5);   /*  enable i2c repeater on stv0299  */
-                        state->config->pll_set(fe, p);
+                        state->config->pll_set(fe, state->i2c, p);
                         stv0299_writeregI(state, 0x05, 0x35);   /*  disable i2c repeater on stv0299  */
 
                         stv0299_writeregI(state, 0x32, 0x80);
@@ -615,7 +613,7 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
                 }
         } else {
                 stv0299_writeregI(state, 0x05, 0xb5);   /*  enable i2c repeater on stv0299  */
-                state->config->pll_set(fe, p);
+                state->config->pll_set(fe, state->i2c, p);
                 stv0299_writeregI(state, 0x05, 0x35);   /*  disable i2c repeater on stv0299  */
 
                 stv0299_set_FEC (state, p->u.qpsk.fec_inner);
@@ -709,7 +707,6 @@ struct dvb_frontend* stv0299_attach(const struct stv0299_config* config,
         state->tuner_frequency = 0;
         state->symbol_rate = 0;
         state->fec_inner = 0;
-        state->errmode = STATUS_BER;
 
         /* check if the demod is there */
         stv0299_writeregI(state, 0x02, 0x34); /* standby off */
diff --git a/drivers/media/dvb/frontends/stv0299.h b/drivers/media/dvb/frontends/stv0299.h
index 79457a80a11f..d0c4484861e1 100644
--- a/drivers/media/dvb/frontends/stv0299.h
+++ b/drivers/media/dvb/frontends/stv0299.h
@@ -92,8 +92,8 @@ struct stv0299_config
         int (*set_symbol_rate)(struct dvb_frontend* fe, u32 srate, u32 ratio);
 
         /* PLL maintenance */
-        int (*pll_init)(struct dvb_frontend* fe);
-        int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);
+        int (*pll_init)(struct dvb_frontend *fe, struct i2c_adapter *i2c);
+        int (*pll_set)(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct dvb_frontend_parameters *params);
 };
 
 extern int stv0299_writereg (struct dvb_frontend* fe, u8 reg, u8 data);
diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c
index ab0c032472cc..74cea9f8d721 100644
--- a/drivers/media/dvb/frontends/tda1004x.c
+++ b/drivers/media/dvb/frontends/tda1004x.c
@@ -1046,8 +1046,7 @@ static int tda1004x_read_snr(struct dvb_frontend* fe, u16 * snr)
         tmp = tda1004x_read_byte(state, TDA1004X_SNR);
         if (tmp < 0)
                 return -EIO;
-        if (tmp)
-                tmp = 255 - tmp;
+        tmp = 255 - tmp;
 
         *snr = ((tmp << 8) | tmp);
         dprintk("%s: snr=0x%x\n", __FUNCTION__, *snr);
diff --git a/drivers/media/dvb/frontends/ves1820.c b/drivers/media/dvb/frontends/ves1820.c
index 70fb44b391a7..c6d276618e86 100644
--- a/drivers/media/dvb/frontends/ves1820.c
+++ b/drivers/media/dvb/frontends/ves1820.c
@@ -194,19 +194,18 @@ static int ves1820_init(struct dvb_frontend* fe)
 {
         struct ves1820_state* state = fe->demodulator_priv;
         int i;
-        int val;
 
         ves1820_writereg(state, 0, 0);
 
-        for (i = 0; i < 53; i++) {
-                val = ves1820_inittab[i];
-                if ((i == 2) && (state->config->selagc)) val |= 0x08;
-                ves1820_writereg(state, i, val);
-        }
+        for (i = 0; i < sizeof(ves1820_inittab); i++)
+                ves1820_writereg(state, i, ves1820_inittab[i]);
+        if (state->config->selagc)
+                ves1820_writereg(state, 2, ves1820_inittab[2] | 0x08);
 
         ves1820_writereg(state, 0x34, state->pwm);
 
-        if (state->config->pll_init) state->config->pll_init(fe);
+        if (state->config->pll_init)
+                state->config->pll_init(fe);
 
         return 0;
 }
@@ -234,7 +233,7 @@ static int ves1820_set_parameters(struct dvb_frontend* fe, struct dvb_frontend_p
         ves1820_writereg(state, 0x09, reg0x09[real_qam]);
 
         ves1820_setup_reg0(state, reg0x00[real_qam], p->inversion);
-
+        ves1820_writereg(state, 2, ves1820_inittab[2] | (state->config->selagc ? 0x08 : 0));
         return 0;
 }