diff --git a/[refs] b/[refs] index d11f8daaf028..b2f5f7f1b105 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef0c87001c50ade70183b5cccbf573ef28320965 +refs/heads/master: 619ab8f611e269e12c956361a38a4206cef9155d diff --git a/trunk/drivers/media/tuners/r820t.c b/trunk/drivers/media/tuners/r820t.c index 36ddbf1e08b3..e6e7a06d2b40 100644 --- a/trunk/drivers/media/tuners/r820t.c +++ b/trunk/drivers/media/tuners/r820t.c @@ -1854,15 +1854,12 @@ static int r820t_imr(struct r820t_priv *priv, unsigned imr_mem, bool im_flag) else ring_ref = priv->cfg->xtal; + n_ring = 15; for (n = 0; n < 16; n++) { if ((16 + n) * 8 * ring_ref >= 3100000) { n_ring = n; break; } - - /* n_ring not found */ - if (n == 15) - n_ring = n; } reg18 = r820t_read_cache_reg(priv, 0x18);