V4L/DVB (6965): tda18271: fix analog tuning regression caused by earlier changeset

An earlier patch, "tda18271: fail table lookups if frequency is out of range"
broke analog support on certain hardware.  This patch fixes that problem, by
allowing the RF_CAL byte to be set to the maximum value, in cases of the
frequency being out of range.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/dvb/frontends/tda18271-common.c b/drivers/media/dvb/frontends/tda18271-common.c
index 4adc7390ba00212c2567cb602188f9364d267279..d7a3356594743297a42028e698468ea39dee8a0c 100644 (file)
--- a/drivers/media/dvb/frontends/tda18271-common.c
+++ b/drivers/media/dvb/frontends/tda18271-common.c
@@ -601,13 +601,11 @@ int tda18271_calc_rf_cal(struct dvb_frontend *fe, u32 *freq)
        unsigned char *regs = priv->tda18271_regs;
        u8 val;
 
-       int ret = tda18271_lookup_map(fe, RF_CAL, freq, &val);
-       if (ret < 0)
-               goto fail;
+       tda18271_lookup_map(fe, RF_CAL, freq, &val);
 
        regs[R_EB14] = val;
-fail:
-       return ret;
+
+       return 0;
 }
 
 /*

diff --git a/drivers/media/dvb/frontends/tda18271-tables.c b/drivers/media/dvb/frontends/tda18271-tables.c
index 528a2ec9e967e6714cc1e711d1fd5caefc5a2408..0402c7dab19dec5e5a408ad2f6f4d3de25f8fa3b 100644 (file)
--- a/drivers/media/dvb/frontends/tda18271-tables.c
+++ b/drivers/media/dvb/frontends/tda18271-tables.c
@@ -1098,7 +1098,7 @@ int tda18271_lookup_pll_map(struct dvb_frontend *fe,
        }
 
        while ((map[i].lomax * 1000) < *freq) {
-               if (map[i].lomax == 0) {
+               if (map[i + 1].lomax == 0) {
                        tda_map("%s: frequency (%d) out of range\n",
                                map_name, *freq);
                        ret = -ERANGE;
@@ -1169,7 +1169,7 @@ int tda18271_lookup_map(struct dvb_frontend *fe,
        }
 
        while ((map[i].rfmax * 1000) < *freq) {
-               if (map[i].rfmax == 0) {
+               if (map[i + 1].rfmax == 0) {
                        tda_map("%s: frequency (%d) out of range\n",
                                map_name, *freq);
                        ret = -ERANGE;