Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6] / drivers / media / dvb / frontends / mt2131.c

diff --git a/drivers/media/dvb/frontends/mt2131.c b/drivers/media/dvb/frontends/mt2131.c
index 6bcc4ccc9911721845acf3c3153668586049c90d..13cf16668171bb611b73ac143e7a77bfcf34b89e 100644 (file)
--- a/drivers/media/dvb/frontends/mt2131.c
+++ b/drivers/media/dvb/frontends/mt2131.c
@@ -91,17 +91,6 @@ static int mt2131_writeregs(struct mt2131_priv *priv,u8 *buf, u8 len)
        return 0;
 }
 
-static int mt2131_set_gpo(struct dvb_frontend *fe, u8 val)
-{
-       struct mt2131_priv *priv = fe->tuner_priv;
-       u8 v;
-
-       mt2131_readreg(priv, 0x07, &v);
-       mt2131_writereg(priv, 0x07, (v & 0xfe) | (val & 0x01));
-
-       return 0;
-}
-
 static int mt2131_set_params(struct dvb_frontend *fe,
                             struct dvb_frontend_parameters *params)
 {
@@ -127,7 +116,7 @@ static int mt2131_set_params(struct dvb_frontend *fe,
        f_lo1 = (f_lo1 / 250) * 250;
        f_lo2 = f_lo1 - freq - MT2131_IF2;
 
-       priv->frequency =  (f_lo1 - f_lo2 - MT2131_IF2) * 1000,
+       priv->frequency =  (f_lo1 - f_lo2 - MT2131_IF2) * 1000;
 
        /* Frequency LO1 = 16MHz * (DIV1 + NUM1/8192 ) */
        num1 = f_lo1 * 64 / (MT2131_FREF / 128);