6 files changed, 18 insertions, 19 deletions

diff --git a/drivers/media/dvb/frontends/stb0899_algo.c b/drivers/media/dvb/frontends/stb0899_algo.c
index a67d1775a43c..2da55ec20392 100644
--- a/drivers/media/dvb/frontends/stb0899_algo.c
+++ b/drivers/media/dvb/frontends/stb0899_algo.c
@@ -156,7 +156,7 @@ static void stb0899_first_subrange(struct stb0899_state *state)
         }
 
         if (range > 0)
-                internal->sub_range = MIN(internal->srch_range, range);
+                internal->sub_range = min(internal->srch_range, range);
         else
                 internal->sub_range = 0;
 
@@ -185,7 +185,7 @@ static enum stb0899_status stb0899_check_tmg(struct stb0899_state *state)
         timing = stb0899_read_reg(state, STB0899_RTF);
 
         if (lock >= 42) {
-                if ((lock > 48) && (ABS(timing) >= 110)) {
+                if ((lock > 48) && (abs(timing) >= 110)) {
                         internal->status = ANALOGCARRIER;
                         dprintk(state->verbose, FE_DEBUG, 1, "-->ANALOG Carrier !");
                 } else {
@@ -222,7 +222,7 @@ static enum stb0899_status stb0899_search_tmg(struct stb0899_state *state)
                 index++;
                 derot_freq += index * internal->direction * derot_step; /* next derot zig zag position  */
 
-                if (ABS(derot_freq) > derot_limit)
+                if (abs(derot_freq) > derot_limit)
                         next_loop--;
 
                 if (next_loop) {
@@ -298,7 +298,7 @@ static enum stb0899_status stb0899_search_carrier(struct stb0899_state *state)
                         last_derot_freq = derot_freq;
                         derot_freq += index * internal->direction * internal->derot_step; /* next zig zag derotator position */
 
-                        if(ABS(derot_freq) > derot_limit)
+                        if(abs(derot_freq) > derot_limit)
                                 next_loop--;
 
                         if (next_loop) {
@@ -400,7 +400,7 @@ static enum stb0899_status stb0899_search_data(struct stb0899_state *state)
                 if ((internal->status != CARRIEROK) || (stb0899_check_data(state) != DATAOK)) {
 
                         derot_freq += index * internal->direction * derot_step; /* next zig zag derotator position */
-                        if (ABS(derot_freq) > derot_limit)
+                        if (abs(derot_freq) > derot_limit)
                                 next_loop--;
 
                         if (next_loop) {
@@ -467,7 +467,7 @@ static void next_sub_range(struct stb0899_state *state)
 
         if (internal->sub_dir > 0) {
                 old_sub_range = internal->sub_range;
-                internal->sub_range = MIN((internal->srch_range / 2) -
+                internal->sub_range = min((internal->srch_range / 2) -
                                           (internal->tuner_offst + internal->sub_range / 2),
                                            internal->sub_range);
 
@@ -771,7 +771,7 @@ static long Log2Int(int number)
         int i;
 
         i = 0;
-        while ((1 << i) <= ABS(number))
+        while ((1 << i) <= abs(number))
                 i++;
 
         if (number == 0)
diff --git a/drivers/media/dvb/frontends/stb0899_drv.c b/drivers/media/dvb/frontends/stb0899_drv.c
index 10613acf18f5..a04c782fff8d 100644
--- a/drivers/media/dvb/frontends/stb0899_drv.c
+++ b/drivers/media/dvb/frontends/stb0899_drv.c
@@ -794,7 +794,7 @@ static int stb0899_send_diseqc_burst(struct dvb_frontend *fe, fe_sec_mini_cmd_t
         reg = stb0899_read_reg(state, STB0899_DISCNTRL1);
         old_state = reg;
         /* set to burst mode    */
-        STB0899_SETFIELD_VAL(DISEQCMODE, reg, 0x02);
+        STB0899_SETFIELD_VAL(DISEQCMODE, reg, 0x03);
         STB0899_SETFIELD_VAL(DISPRECHARGE, reg, 0x01);
         stb0899_write_reg(state, STB0899_DISCNTRL1, reg);
         switch (burst) {
diff --git a/drivers/media/dvb/frontends/stb0899_priv.h b/drivers/media/dvb/frontends/stb0899_priv.h
index 24619e3689db..82395b912815 100644
--- a/drivers/media/dvb/frontends/stb0899_priv.h
+++ b/drivers/media/dvb/frontends/stb0899_priv.h
@@ -59,10 +59,6 @@
 #define MAKEWORD32(a, b, c, d)                  (((a) << 24) | ((b) << 16) | ((c) << 8) | (d))
 #define MAKEWORD16(a, b)                        (((a) << 8) | (b))
 
-#define MIN(x, y)                               ((x) <= (y) ? (x) : (y))
-#define MAX(x, y)                               ((x) >= (y) ? (x) : (y))
-#define ABS(x)                                  ((x) >= 0 ? (x) : -(x))
-
 #define LSB(x)                                  ((x & 0xff))
 #define MSB(y)                                  ((y >> 8) & 0xff)
 
@@ -168,10 +164,10 @@ struct stb0899_internal {
         u32                     freq;                   /* Demod internal Frequency             */
         u32                     srate;                  /* Demod internal Symbol rate           */
         enum stb0899_fec        fecrate;                /* Demod internal FEC rate              */
-        u32                     srch_range;             /* Demod internal Search Range          */
-        u32                     sub_range;              /* Demod current sub range (Hz)         */
-        u32                     tuner_step;             /* Tuner step (Hz)                      */
-        u32                     tuner_offst;            /* Relative offset to carrier (Hz)      */
+        s32                     srch_range;             /* Demod internal Search Range          */
+        s32                     sub_range;              /* Demod current sub range (Hz)         */
+        s32                     tuner_step;             /* Tuner step (Hz)                      */
+        s32                     tuner_offst;            /* Relative offset to carrier (Hz)      */
         u32                     tuner_bw;               /* Current bandwidth of the tuner (Hz)  */
 
         s32                     mclk;                   /* Masterclock Divider factor (binary)  */
diff --git a/drivers/media/dvb/frontends/stb6100.c b/drivers/media/dvb/frontends/stb6100.c
index ff39275ab49c..1ed5a7db4c5e 100644
--- a/drivers/media/dvb/frontends/stb6100.c
+++ b/drivers/media/dvb/frontends/stb6100.c
@@ -427,11 +427,11 @@ static int stb6100_init(struct dvb_frontend *fe)
         status->refclock        = 27000000;     /* Hz   */
         status->iqsense         = 1;
         status->bandwidth       = 36000;        /* kHz  */
-        state->bandwidth        = status->bandwidth * 1000;     /* MHz  */
+        state->bandwidth        = status->bandwidth * 1000;     /* Hz   */
         state->reference        = status->refclock / 1000;      /* kHz  */
 
         /* Set default bandwidth.       */
-        return stb6100_set_bandwidth(fe, status->bandwidth);
+        return stb6100_set_bandwidth(fe, state->bandwidth);
 }
 
 static int stb6100_get_state(struct dvb_frontend *fe,
diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
index 170720b02815..b150ed306696 100644
--- a/drivers/media/dvb/frontends/zl10353.c
+++ b/drivers/media/dvb/frontends/zl10353.c
@@ -590,7 +590,7 @@ static int zl10353_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
         struct zl10353_state *state = fe->demodulator_priv;
         u8 val = 0x0a;
 
-        if (state->config.no_tuner) {
+        if (state->config.disable_i2c_gate_ctrl) {
                 /* No tuner attached to the internal I2C bus */
                 /* If set enable I2C bridge, the main I2C bus stopped hardly */
                 return 0;
diff --git a/drivers/media/dvb/frontends/zl10353.h b/drivers/media/dvb/frontends/zl10353.h
index fdbb88ff75fe..2287bac46243 100644
--- a/drivers/media/dvb/frontends/zl10353.h
+++ b/drivers/media/dvb/frontends/zl10353.h
@@ -38,6 +38,9 @@ struct zl10353_config
 
         /* set if parallel ts output is required */
         int parallel_ts;
+
+        /* set if i2c_gate_ctrl disable is required */
+        u8 disable_i2c_gate_ctrl:1;
 };
 
 #if defined(CONFIG_DVB_ZL10353) || (defined(CONFIG_DVB_ZL10353_MODULE) && defined(MODULE))