From ebd34a546b09601f1864c629ab0750f4689ee828 Mon Sep 17 00:00:00 2001
From: Manu Abraham <manu@kromtek.com>
Date: Sat, 28 May 2005 15:51:51 -0700
Subject: [PATCH] --- yaml --- r: 1631 b: refs/heads/master c:
 86360a3edeb6b7b6230dc13ef6835d2851409502 h: refs/heads/master i:   1629:
 75e79a19ae31d17e8aaee13c33b2994b7a726855   1627:
 03e2f6ee42f6967a1f1907e87a3c9bfc7e35a71d   1623:
 bf086569046c8c8b1b2132970bf50d5486489bd8   1615:
 e726c0eeb1c72617a67e0ba525374a77f410f5f8   1599:
 0c9bf76477ec51b63e15f56a1120243123ee585e v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/media/dvb/bt8xx/dst.c | 27 +++++++++------------------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index db52fe2023f2..1c55aae46310 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f6da8f166228c1720d16216a9d82d630c58de57
+refs/heads/master: 86360a3edeb6b7b6230dc13ef6835d2851409502
diff --git a/trunk/drivers/media/dvb/bt8xx/dst.c b/trunk/drivers/media/dvb/bt8xx/dst.c
index 33cca69d67a7..8104240a2208 100644
--- a/trunk/drivers/media/dvb/bt8xx/dst.c
+++ b/trunk/drivers/media/dvb/bt8xx/dst.c
@@ -907,12 +907,7 @@ static int dst_tone_power_cmd(struct dst_state* state)
 		return 0;
 
 	paket[4] = state->tx_tuna[4];
-
-	if (state->tone == SEC_TONE_ON)
-		paket[2] = 0x02;
-	else
-		paket[2] = 0;
-
+	paket[2] = state->tx_tuna[2];
 	paket[3] = state->tx_tuna[3];
 	paket[7] = dst_check_sum (paket, 7);
 	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)
 {
-	u8 *val;
 	struct dst_state* state = fe->demodulator_priv;
 
 	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)
 		return 0;
 
-	val = &state->tx_tuna[0];
-
-	val[8] &= ~0x1;
-
 	switch (tone) {
-	case SEC_TONE_OFF:
-		break;
+		case SEC_TONE_OFF:
+			state->tx_tuna[2] = 0xff;
+			break;
 
-	case SEC_TONE_ON:
-		val[8] |= 1;
-		break;
+		case SEC_TONE_ON:
+			state->tx_tuna[2] = 0x02;
+			break;
 
-	default:
-		return -EINVAL;
+		default:
+			return -EINVAL;
 	}
 	dst_tone_power_cmd(state);