openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] dvb: Fix 22k tone control 

Signed-off-by: Manu Abraham <manu@kromtek.com>
Cc: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Manu Abraham 2005-05-28 15:51:51 -07:00 committed by Linus Torvalds
parent 8f6da8f166
commit 86360a3ede
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/media/dvb/bt8xx/dst.c
View File

@ -907,12 +907,7 @@ static int dst_tone_power_cmd(struct dst_state* state)
return 0; return 0;
paket[4] = state->tx_tuna[4]; paket[4] = state->tx_tuna[4];
paket[2] = state->tx_tuna[2];
if (state->tone == SEC_TONE_ON)
paket[2] = 0x02;
else
paket[2] = 0;
paket[3] = state->tx_tuna[3]; paket[3] = state->tx_tuna[3];
paket[7] = dst_check_sum (paket, 7); paket[7] = dst_check_sum (paket, 7);
dst_command(state, paket, 8); dst_command(state, paket, 8);
@ -1094,7 +1089,6 @@ static int dst_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
static int dst_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone) static int dst_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
{ {
u8 *val;
struct dst_state* state = fe->demodulator_priv; struct dst_state* state = fe->demodulator_priv;
state->tone = tone; state->tone = tone;
@ -1102,20 +1096,17 @@ static int dst_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
if (state->dst_type == DST_TYPE_IS_TERR) if (state->dst_type == DST_TYPE_IS_TERR)
return 0; return 0;
val = &state->tx_tuna[0];
val[8] &= ~0x1;
switch (tone) { switch (tone) {
case SEC_TONE_OFF: case SEC_TONE_OFF:
break; state->tx_tuna[2] = 0xff;
break;
case SEC_TONE_ON: case SEC_TONE_ON:
val[8] |= 1; state->tx_tuna[2] = 0x02;
break; break;
default: default:
return -EINVAL; return -EINVAL;
} }
dst_tone_power_cmd(state); dst_tone_power_cmd(state);