Merge branch 'stable/bug-fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / media / dvb / frontends / stv0367.c

diff --git a/drivers/media/dvb/frontends/stv0367.c b/drivers/media/dvb/frontends/stv0367.c
index 120fed8..e57ab53 100644 (file)
--- a/drivers/media/dvb/frontends/stv0367.c
+++ b/drivers/media/dvb/frontends/stv0367.c
@@ -913,7 +913,7 @@ static u32 stv0367_get_tuner_freq(struct dvb_frontend *fe)
        struct dvb_frontend_ops *frontend_ops = NULL;
        struct dvb_tuner_ops    *tuner_ops = NULL;
        u32 freq = 0;
-       u32 err = 0;
+       int err = 0;
 
        dprintk("%s:\n", __func__);
 
@@ -1046,7 +1046,7 @@ static u32 stv0367ter_get_mclk(struct stv0367_state *state, u32 ExtClk_Hz)
 }
 
 static int stv0367ter_filt_coeff_init(struct stv0367_state *state,
-                               u16 CellsCoeffs[2][6][5], u32 DemodXtal)
+                               u16 CellsCoeffs[3][6][5], u32 DemodXtal)
 {
        int i, j, k, freq;
 
@@ -1328,7 +1328,7 @@ stv0367_ter_signal_type stv0367ter_lock_algo(struct stv0367_state *state)
 
        /*guard=stv0367_readbits(state,F367TER_SYR_GUARD); */
 
-       /*supress EPQ auto for SYR_GARD 1/16 or 1/32
+       /*suppress EPQ auto for SYR_GARD 1/16 or 1/32
        and set channel predictor in automatic */
 #if 0
        switch (guard) {
@@ -1940,7 +1940,7 @@ static int stv0367ter_get_frontend(struct dvb_frontend *fe,
        int constell = 0,/* snr = 0,*/ Data = 0;
 
        param->frequency = stv0367_get_tuner_freq(fe);
-       if (param->frequency < 0)
+       if ((int)param->frequency < 0)
                param->frequency = c->frequency;
 
        constell = stv0367_readbits(state, F367TER_TPS_CONST);