diff --git a/[refs] b/[refs]
index c7b361990060..13f72e872aa1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e1fab90a8a76e09b669d3159ec910eab7ee97d6
+refs/heads/master: d2c932a1f7aca16727ce6670c5eccb0a4e2b47a5
diff --git a/trunk/drivers/media/dvb/frontends/tda18271-common.c b/trunk/drivers/media/dvb/frontends/tda18271-common.c
index 4adc7390ba00..d7a335659474 100644
--- a/trunk/drivers/media/dvb/frontends/tda18271-common.c
+++ b/trunk/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/trunk/drivers/media/dvb/frontends/tda18271-tables.c b/trunk/drivers/media/dvb/frontends/tda18271-tables.c
index 528a2ec9e967..0402c7dab19d 100644
--- a/trunk/drivers/media/dvb/frontends/tda18271-tables.c
+++ b/trunk/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;