From 76c95e36ec9a462ef1e152c4160b11abde31e7da Mon Sep 17 00:00:00 2001 From: Edward Sheldrake Date: Fri, 26 Aug 2011 12:59:30 -0300 Subject: [PATCH] --- yaml --- r: 271742 b: refs/heads/master c: f8a26f052a5f62c7555d09680c1fe8cbfcac590f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/drxd_hard.c | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4712d1b876c4..4861abd0bd94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 133a9fe949862d9ed8411fb423739f4cee08232d +refs/heads/master: f8a26f052a5f62c7555d09680c1fe8cbfcac590f diff --git a/trunk/drivers/media/dvb/frontends/drxd_hard.c b/trunk/drivers/media/dvb/frontends/drxd_hard.c index 2238bf0be959..bcad01ca1a13 100644 --- a/trunk/drivers/media/dvb/frontends/drxd_hard.c +++ b/trunk/drivers/media/dvb/frontends/drxd_hard.c @@ -889,10 +889,15 @@ static int ReadIFAgc(struct drxd_state *state, u32 * pValue) u32 R2 = state->if_agc_cfg.R2; u32 R3 = state->if_agc_cfg.R3; - u32 Vmax = (3300 * R2) / (R1 + R2); - u32 Rpar = (R2 * R3) / (R3 + R2); - u32 Vmin = (3300 * Rpar) / (R1 + Rpar); - u32 Vout = Vmin + ((Vmax - Vmin) * Value) / 1024; + u32 Vmax, Rpar, Vmin, Vout; + + if (R2 == 0 && (R1 == 0 || R3 == 0)) + return 0; + + Vmax = (3300 * R2) / (R1 + R2); + Rpar = (R2 * R3) / (R3 + R2); + Vmin = (3300 * Rpar) / (R1 + Rpar); + Vout = Vmin + ((Vmax - Vmin) * Value) / 1024; *pValue = Vout; }