[media] tuner-core/tda9887: get_afc can be tuner mode specific
The get_afc op in tda9887 is valid only for the radio mode. But due to the way get_afc in analog_demod_ops was designed it would overwrite the afc value with a bogus value when in TV mode. Pass a pointer to the afc value instead, and when not in radio mode leave it alone in the tda9887. This broke a long time ago in 2.6.19 when the get_afc op was introduced. Before that the afc was only set for radio mode in the tda9887. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:

committed by
Mauro Carvalho Chehab

parent
d047795c59
commit
a2192cf47f
@@ -596,22 +596,22 @@ static void tda9887_tuner_status(struct dvb_frontend *fe)
|
||||
priv->data[1], priv->data[2], priv->data[3]);
|
||||
}
|
||||
|
||||
static int tda9887_get_afc(struct dvb_frontend *fe)
|
||||
static int tda9887_get_afc(struct dvb_frontend *fe, s32 *afc)
|
||||
{
|
||||
struct tda9887_priv *priv = fe->analog_demod_priv;
|
||||
static int AFC_BITS_2_kHz[] = {
|
||||
static const int AFC_BITS_2_kHz[] = {
|
||||
-12500, -37500, -62500, -97500,
|
||||
-112500, -137500, -162500, -187500,
|
||||
187500, 162500, 137500, 112500,
|
||||
97500 , 62500, 37500 , 12500
|
||||
};
|
||||
int afc=0;
|
||||
__u8 reg = 0;
|
||||
|
||||
if (1 == tuner_i2c_xfer_recv(&priv->i2c_props,®,1))
|
||||
afc = AFC_BITS_2_kHz[(reg>>1)&0x0f];
|
||||
|
||||
return afc;
|
||||
if (priv->mode != V4L2_TUNER_RADIO)
|
||||
return 0;
|
||||
if (1 == tuner_i2c_xfer_recv(&priv->i2c_props, ®, 1))
|
||||
*afc = AFC_BITS_2_kHz[(reg >> 1) & 0x0f];
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void tda9887_standby(struct dvb_frontend *fe)
|
||||
|
Reference in New Issue
Block a user