From: Matthias Schwarzott Date: Thu, 3 Dec 2015 20:12:50 +0000 (-0200) Subject: [media] si2165: Reject DVB-T bandwidth auto mode X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7655a3aea2ca14b9d34af929304f3c08140cc91c;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [media] si2165: Reject DVB-T bandwidth auto mode The si2165 does not support bandwidth auto-detection. Reject the request. Signed-off-by: Matthias Schwarzott Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/dvb-frontends/si2165.c b/drivers/media/dvb-frontends/si2165.c index 2b93241d4bc1..659976612392 100644 --- a/drivers/media/dvb-frontends/si2165.c +++ b/drivers/media/dvb-frontends/si2165.c @@ -825,19 +825,19 @@ static int si2165_set_frontend_dvbt(struct dvb_frontend *fe) struct si2165_state *state = fe->demodulator_priv; u32 dvb_rate = 0; u16 bw10k; + u32 bw_hz = p->bandwidth_hz; dprintk("%s: called\n", __func__); if (!state->has_dvbt) return -EINVAL; - if (p->bandwidth_hz > 0) { - dvb_rate = p->bandwidth_hz * 8 / 7; - bw10k = p->bandwidth_hz / 10000; - } else { - dvb_rate = 8 * 8 / 7; - bw10k = 800; - } + /* no bandwidth auto-detection */ + if (bw_hz == 0) + return -EINVAL; + + dvb_rate = bw_hz * 8 / 7; + bw10k = bw_hz / 10000; ret = si2165_adjust_pll_divl(state, 12); if (ret < 0)