From 86c58eef5e08ad766f20773105cb043826234014 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 23 Dec 2011 08:06:18 -0300
Subject: [PATCH] --- yaml --- r: 285471 b: refs/heads/master c:
 a0a9ff7f58c99bad8a57d5cafaa29b86cfda6186 h: refs/heads/master i:   285469:
 189b33419a4746000d92b11d58caeb2a762db3a0   285467:
 7d8d361f8a02ea9d53fbb7a00507e0d5de92f7a3   285463:
 3c7895f248beda4b1b0c46fdcd868f0393204645   285455:
 86620fc41bd9232492c6e7a85eacf357cb28b10c   285439:
 3f73f14a5337acf107275770d7cb6b32ea9d79e5 v: v3

---
 [refs]                                       |  2 +-
 trunk/drivers/media/dvb/ttpci/budget-patch.c | 23 +++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 067e35c9e1f5..849e5a58cb24 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b54464f16ae4f0a7ce14f384294ddb30c203a21
+refs/heads/master: a0a9ff7f58c99bad8a57d5cafaa29b86cfda6186
diff --git a/trunk/drivers/media/dvb/ttpci/budget-patch.c b/trunk/drivers/media/dvb/ttpci/budget-patch.c
index 3395d1a90516..4485cccf004e 100644
--- a/trunk/drivers/media/dvb/ttpci/budget-patch.c
+++ b/trunk/drivers/media/dvb/ttpci/budget-patch.c
@@ -263,17 +263,23 @@ static int budget_patch_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_c
 
 static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
 {
+	struct dtv_frontend_properties *p = &fe->dtv_property_cache;
 	struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv;
 	u8 pwr = 0;
 	u8 buf[4];
 	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
-	u32 div = (params->frequency + 479500) / 125;
-
-	if (params->frequency > 2000000) pwr = 3;
-	else if (params->frequency > 1800000) pwr = 2;
-	else if (params->frequency > 1600000) pwr = 1;
-	else if (params->frequency > 1200000) pwr = 0;
-	else if (params->frequency >= 1100000) pwr = 1;
+	u32 div = (p->frequency + 479500) / 125;
+
+	if (p->frequency > 2000000)
+		pwr = 3;
+	else if (p->frequency > 1800000)
+		pwr = 2;
+	else if (p->frequency > 1600000)
+		pwr = 1;
+	else if (p->frequency > 1200000)
+		pwr = 0;
+	else if (p->frequency >= 1100000)
+		pwr = 1;
 	else pwr = 2;
 
 	buf[0] = (div >> 8) & 0x7f;
@@ -299,12 +305,13 @@ static struct ves1x93_config alps_bsrv2_config = {
 
 static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
 {
+	struct dtv_frontend_properties *p = &fe->dtv_property_cache;
 	struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv;
 	u32 div;
 	u8 data[4];
 	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };
 
-	div = params->frequency / 125;
+	div = p->frequency / 125;
 	data[0] = (div >> 8) & 0x7f;
 	data[1] = div & 0xff;
 	data[2] = 0x8e;