Skip to content

Commit

Permalink
[media] tuner-core: handle errors when getting signal strength/afc
Browse files Browse the repository at this point in the history
If those callbacks fail, it should return zero, and not a random
value. The previous code assumed that all drivers would only change
signal strength if it succeeds, but this may not be true.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Mauro Carvalho Chehab committed Mar 25, 2013
1 parent 6f8ca0b commit 004e45d
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions drivers/media/v4l2-core/tuner-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -220,18 +220,20 @@ static void fe_standby(struct dvb_frontend *fe)

static int fe_has_signal(struct dvb_frontend *fe)
{
u16 strength = 0;
u16 strength;

fe->ops.tuner_ops.get_rf_strength(fe, &strength);
if (fe->ops.tuner_ops.get_rf_strength(fe, &strength) < 0)
return 0;

return strength;
}

static int fe_get_afc(struct dvb_frontend *fe)
{
s32 afc = 0;
s32 afc;

fe->ops.tuner_ops.get_afc(fe, &afc);
if (fe->ops.tuner_ops.get_afc(fe, &afc) < 0)
return 0;

return afc;
}
Expand Down

0 comments on commit 004e45d

Please sign in to comment.