[media] stv0367: signedness bug in stv0367_get_tuner_freq()

[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 6d4d49e..0ddcf7e 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__);
 
@@ -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);
@@ -3367,6 +3367,24 @@ static int stv0367cab_read_snr(struct dvb_frontend *fe, u16 *snr)
        return 0;
 }
 
+static int stv0367cab_read_ucblcks(struct dvb_frontend *fe, u32 *ucblocks)
+{
+       struct stv0367_state *state = fe->demodulator_priv;
+       int corrected, tscount;
+
+       *ucblocks = (stv0367_readreg(state, R367CAB_RS_COUNTER_5) << 8)
+                       | stv0367_readreg(state, R367CAB_RS_COUNTER_4);
+       corrected = (stv0367_readreg(state, R367CAB_RS_COUNTER_3) << 8)
+                       | stv0367_readreg(state, R367CAB_RS_COUNTER_2);
+       tscount = (stv0367_readreg(state, R367CAB_RS_COUNTER_2) << 8)
+                       | stv0367_readreg(state, R367CAB_RS_COUNTER_1);
+
+       dprintk("%s: uncorrected blocks=%d corrected blocks=%d tscount=%d\n",
+                               __func__, *ucblocks, corrected, tscount);
+
+       return 0;
+};
+
 static struct dvb_frontend_ops stv0367cab_ops = {
        .info = {
                .name = "ST STV0367 DVB-C",
@@ -3391,7 +3409,7 @@ static struct dvb_frontend_ops stv0367cab_ops = {
 /*     .read_ber                               = stv0367cab_read_ber, */
        .read_signal_strength                   = stv0367cab_read_strength,
        .read_snr                               = stv0367cab_read_snr,
-/*     .read_ucblocks                          = stv0367cab_read_ucblcks,*/
+       .read_ucblocks                          = stv0367cab_read_ucblcks,
        .get_tune_settings                      = stv0367_get_tune_settings,
 };