aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/tuners/tda9887.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-04-06 03:35:27 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-04-14 18:43:40 -0400
commita2192cf47f593681cd65798880853c5224066c81 (patch)
tree1883c7aa872f02413ff8c3da558e40c4f3b3ab1c /drivers/media/tuners/tda9887.c
parentd047795c590f63d42160b84ac778b09af297d914 (diff)
[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>
Diffstat (limited to 'drivers/media/tuners/tda9887.c')
-rw-r--r--drivers/media/tuners/tda9887.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/tuners/tda9887.c b/drivers/media/tuners/tda9887.c
index cdb645d57438..300005c535ba 100644
--- a/drivers/media/tuners/tda9887.c
+++ b/drivers/media/tuners/tda9887.c
@@ -596,22 +596,22 @@ static void tda9887_tuner_status(struct dvb_frontend *fe)
596 priv->data[1], priv->data[2], priv->data[3]); 596 priv->data[1], priv->data[2], priv->data[3]);
597} 597}
598 598
599static int tda9887_get_afc(struct dvb_frontend *fe) 599static int tda9887_get_afc(struct dvb_frontend *fe, s32 *afc)
600{ 600{
601 struct tda9887_priv *priv = fe->analog_demod_priv; 601 struct tda9887_priv *priv = fe->analog_demod_priv;
602 static int AFC_BITS_2_kHz[] = { 602 static const int AFC_BITS_2_kHz[] = {
603 -12500, -37500, -62500, -97500, 603 -12500, -37500, -62500, -97500,
604 -112500, -137500, -162500, -187500, 604 -112500, -137500, -162500, -187500,
605 187500, 162500, 137500, 112500, 605 187500, 162500, 137500, 112500,
606 97500 , 62500, 37500 , 12500 606 97500 , 62500, 37500 , 12500
607 }; 607 };
608 int afc=0;
609 __u8 reg = 0; 608 __u8 reg = 0;
610 609
611 if (1 == tuner_i2c_xfer_recv(&priv->i2c_props,&reg,1)) 610 if (priv->mode != V4L2_TUNER_RADIO)
612 afc = AFC_BITS_2_kHz[(reg>>1)&0x0f]; 611 return 0;
613 612 if (1 == tuner_i2c_xfer_recv(&priv->i2c_props, &reg, 1))
614 return afc; 613 *afc = AFC_BITS_2_kHz[(reg >> 1) & 0x0f];
614 return 0;
615} 615}
616 616
617static void tda9887_standby(struct dvb_frontend *fe) 617static void tda9887_standby(struct dvb_frontend *fe)