From 39831432a4c21afeb8d28dbfdc0d2b5c4657a8ff Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 23 Dec 2011 07:18:04 -0300
Subject: [PATCH] --- yaml --- r: 285483 b: refs/heads/master c:
 31cbc53fe56497f39e697a904f770cff096ae765 h: refs/heads/master i:   285481:
 769a58009f68435b5b6dc6369de3d0eb7502444a   285479:
 14822587312b49222ba4b00b9873c4451c4510c4 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/media/dvb/mantis/mantis_vp2040.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 71a6a1c0184c..4323f6f97876 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0b6c2a90f5c075ea9f5b069418bb995acb1b363
+refs/heads/master: 31cbc53fe56497f39e697a904f770cff096ae765
diff --git a/trunk/drivers/media/dvb/mantis/mantis_vp2040.c b/trunk/drivers/media/dvb/mantis/mantis_vp2040.c
index f72b137b7652..beadfea4f0c8 100644
--- a/trunk/drivers/media/dvb/mantis/mantis_vp2040.c
+++ b/trunk/drivers/media/dvb/mantis/mantis_vp2040.c
@@ -49,6 +49,7 @@ struct tda10023_config vp2040_tda10023_cu1216_config = {
 
 static int tda1002x_cu1216_tuner_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
 {
+	struct dtv_frontend_properties *p = &fe->dtv_property_cache;
 	struct mantis_pci *mantis	= fe->dvb->priv;
 	struct i2c_adapter *adapter	= &mantis->adapter;
 
@@ -59,13 +60,13 @@ static int tda1002x_cu1216_tuner_set(struct dvb_frontend *fe, struct dvb_fronten
 #define CU1216_IF 36125000
 #define TUNER_MUL 62500
 
-	u32 div = (params->frequency + CU1216_IF + TUNER_MUL / 2) / TUNER_MUL;
+	u32 div = (p->frequency + CU1216_IF + TUNER_MUL / 2) / TUNER_MUL;
 
 	buf[0] = (div >> 8) & 0x7f;
 	buf[1] = div & 0xff;
 	buf[2] = 0xce;
-	buf[3] = (params->frequency < 150000000 ? 0x01 :
-		  params->frequency < 445000000 ? 0x02 : 0x04);
+	buf[3] = (p->frequency < 150000000 ? 0x01 :
+		  p->frequency < 445000000 ? 0x02 : 0x04);
 	buf[4] = 0xde;
 	buf[5] = 0x20;