From 2eb0e6677e76bd0c3474b6805e4a48ee6c969e1a Mon Sep 17 00:00:00 2001
From: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Date: Mon, 19 Nov 2007 03:47:07 -0300
Subject: [PATCH] --- yaml --- r: 74815 b: refs/heads/master c:
 78f3b0b672c79df9ffa55399a7d6fc4b173e9b4b h: refs/heads/master i:   74813:
 76e04a859087d30b441e8fa6a0cb30018c8bc90f   74811:
 a4e6b012d838f5b1797911875b217c0397e0e415   74807:
 da9284641d605cdc87cad39042132608036bc2ac   74799:
 be99bfa17678530e687a14058f8497cc9a73ce37   74783:
 a76b717e1b6b47b47744400f660f52605d60ae65   74751:
 457e822d40f2dce559350c27c3fe8d73daa215fd v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/dvb/frontends/zl10353.c | 4 ++--
 trunk/drivers/media/dvb/frontends/zl10353.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4af2ec0dad2c..a2283b4e7316 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 820eacd84cff23b76693f4be1e28feb672f4488f
+refs/heads/master: 78f3b0b672c79df9ffa55399a7d6fc4b173e9b4b
diff --git a/trunk/drivers/media/dvb/frontends/zl10353.c b/trunk/drivers/media/dvb/frontends/zl10353.c
index a97a7fd2c891..0106df4c55e8 100644
--- a/trunk/drivers/media/dvb/frontends/zl10353.c
+++ b/trunk/drivers/media/dvb/frontends/zl10353.c
@@ -122,7 +122,7 @@ static void zl10353_calc_nominal_rate(struct dvb_frontend *fe,
 				      enum fe_bandwidth bandwidth,
 				      u16 *nominal_rate)
 {
-	u32 adc_clock = 22528; /* 20.480 MHz on the board(!?) */
+	u32 adc_clock = 45056; /* 45.056 MHz */
 	u8 bw;
 	struct zl10353_state *state = fe->demodulator_priv;
 
@@ -142,7 +142,7 @@ static void zl10353_calc_nominal_rate(struct dvb_frontend *fe,
 		break;
 	}
 
-	*nominal_rate = (64 * bw * (1<<16) / (7 * 8) * 4000 / adc_clock + 2) / 4;
+	*nominal_rate = (bw * (1 << 23) / 7 * 125 + adc_clock / 2) / adc_clock;
 
 	dprintk("%s: bw %d, adc_clock %d => 0x%x\n",
 		__FUNCTION__, bw, adc_clock, *nominal_rate);
diff --git a/trunk/drivers/media/dvb/frontends/zl10353.h b/trunk/drivers/media/dvb/frontends/zl10353.h
index cb274dc12b82..1c3d494a6da9 100644
--- a/trunk/drivers/media/dvb/frontends/zl10353.h
+++ b/trunk/drivers/media/dvb/frontends/zl10353.h
@@ -30,7 +30,7 @@ struct zl10353_config
 	u8 demod_address;
 
 	/* frequencies in kHz */
-	int adc_clock;  // default: 22528
+	int adc_clock;	/* default: 45056 */
 
 	/* set if no pll is connected to the secondary i2c bus */
 	int no_tuner;