From 8f81021006e84f9a56914e953d25864b13575028 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 22 Dec 2011 21:20:31 -0300
Subject: [PATCH] --- yaml --- r: 285468 b: refs/heads/master c:
 8579881bb617cd81559f36523cf5bdcde26af6f7 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/dvb/frontends/zl10039.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3394d3c1bbbb..c6734bfaa978 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27b7faf13af878807ebff04322cad74b053510b4
+refs/heads/master: 8579881bb617cd81559f36523cf5bdcde26af6f7
diff --git a/trunk/drivers/media/dvb/frontends/zl10039.c b/trunk/drivers/media/dvb/frontends/zl10039.c
index c085e58a94bf..7fc8cef408b7 100644
--- a/trunk/drivers/media/dvb/frontends/zl10039.c
+++ b/trunk/drivers/media/dvb/frontends/zl10039.c
@@ -177,8 +177,9 @@ static int zl10039_sleep(struct dvb_frontend *fe)
 }
 
 static int zl10039_set_params(struct dvb_frontend *fe,
-			struct dvb_frontend_parameters *params)
+			      struct dvb_frontend_parameters *params)
 {
+	struct dtv_frontend_properties *c = &fe->dtv_property_cache;
 	struct zl10039_state *state = fe->tuner_priv;
 	u8 buf[6];
 	u8 bf;
@@ -188,12 +189,12 @@ static int zl10039_set_params(struct dvb_frontend *fe,
 
 	dprintk("%s\n", __func__);
 	dprintk("Set frequency = %d, symbol rate = %d\n",
-			params->frequency, params->u.qpsk.symbol_rate);
+			c->frequency, c->symbol_rate);
 
 	/* Assumed 10.111 MHz crystal oscillator */
 	/* Cancelled num/den 80 to prevent overflow */
-	div = (params->frequency * 1000) / 126387;
-	fbw = (params->u.qpsk.symbol_rate * 27) / 32000;
+	div = (c->frequency * 1000) / 126387;
+	fbw = (c->symbol_rate * 27) / 32000;
 	/* Cancelled num/den 10 to prevent overflow */
 	bf = ((fbw * 5088) / 1011100) - 1;