redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[media] xc4000: xc_tune_channel() cleanup

Browse source 
Minor coding changes related to the xc_tune_channel() function.

Signed-off-by: Istvan Varga <istvan_v@mailbox.hu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Istvan Varga 2011-06-04 12:18:41 -03:00 committed by Mauro Carvalho Chehab
parent 818a1776a4
commit e75873c1f8
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/media/common/tuners/xc4000.c
View file

@ -516,12 +516,10 @@ static u16 WaitForLock(struct xc4000_priv *priv)
return lockState; return lockState;
} }
#define XC_TUNE_ANALOG 0 static int xc_tune_channel(struct xc4000_priv *priv, u32 freq_hz)
#define XC_TUNE_DIGITAL 1
static int xc_tune_channel(struct xc4000_priv *priv, u32 freq_hz, int mode)
{ {
int found = 0; int found = 1;
int result = 0; int result;
dprintk(1, "%s(%u)\n", __func__, freq_hz); dprintk(1, "%s(%u)\n", __func__, freq_hz);
@ -533,9 +531,10 @@ static int xc_tune_channel(struct xc4000_priv *priv, u32 freq_hz, int mode)
if (result != XC_RESULT_SUCCESS) if (result != XC_RESULT_SUCCESS)
return 0; return 0;
if (mode == XC_TUNE_ANALOG) { /* wait for lock only in analog TV mode */
if (WaitForLock(priv) == 1) if ((priv->cur_fw.type & (FM | DTV6 | DTV7 | DTV78 | DTV8)) == 0) {
found = 1; if (WaitForLock(priv) != 1)
found = 0;
} }
/* Wait for stats to stabilize. /* Wait for stats to stabilize.
@ -1269,7 +1268,7 @@ static int xc4000_set_params(struct dvb_frontend *fe,
} }
} }
xc_tune_channel(priv, priv->freq_hz, XC_TUNE_DIGITAL); xc_tune_channel(priv, priv->freq_hz);
ret = 0; ret = 0;
@ -1468,7 +1467,7 @@ tune_channel:
} }
} }
xc_tune_channel(priv, priv->freq_hz, XC_TUNE_ANALOG); xc_tune_channel(priv, priv->freq_hz);
ret = 0; ret = 0;