---

yaml --- r: 124099 b: refs/heads/master c: 85eabac h: refs/heads/master i: 124097: 8380451 124095: f164689 v: v3
git-mirror · Dec 29, 2008 · 4523f95 · 4523f95
1 parent c3c4bca
commit 4523f95
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6812086508a38ccb48ed9d5bc9f50732dc818db
+refs/heads/master: 85eabac439ff6b60775e3d6458702dcb6c479e05
diff --git a/trunk/drivers/media/dvb/frontends/stb0899_algo.c b/trunk/drivers/media/dvb/frontends/stb0899_algo.c
@@ -199,9 +199,7 @@ static enum stb0899_status stb0899_check_tmg(struct stb0899_state *state)
 
 	msleep(internal->t_timing);
 
-	reg = stb0899_read_reg(state, STB0899_RTF);
-	STB0899_SETFIELD_VAL(RTF_TIMING_LOOP_FREQ, reg, 0xf2);
-	stb0899_write_reg(state, STB0899_RTF, reg);
+	stb0899_write_reg(state, STB0899_RTF, 0xf2);
 	reg = stb0899_read_reg(state, STB0899_TLIR);
 	lock = STB0899_GETFIELD(TLIR_TMG_LOCK_IND, reg);
 	timing = stb0899_read_reg(state, STB0899_RTF);
@@ -603,9 +601,7 @@ enum stb0899_status stb0899_dvbs_algo(struct stb0899_state *state)
 		cfr[0] = cfr[1] = 0;
 		stb0899_write_regs(state, STB0899_CFRM, cfr, 2); /* RESET derotator frequency	*/
 
-		reg = stb0899_read_reg(state, STB0899_RTF);
-		STB0899_SETFIELD_VAL(RTF_TIMING_LOOP_FREQ, reg, 0);
-		stb0899_write_reg(state, STB0899_RTF, reg);
+		stb0899_write_reg(state, STB0899_RTF, 0);
 		reg = stb0899_read_reg(state, STB0899_CFD);
 		STB0899_SETFIELD_VAL(CFD_ON, reg, 1);
 		stb0899_write_reg(state, STB0899_CFD, reg);

diff --git a/trunk/drivers/media/dvb/frontends/stb0899_drv.c b/trunk/drivers/media/dvb/frontends/stb0899_drv.c
@@ -495,7 +495,7 @@ int stb0899_read_regs(struct stb0899_state *state, unsigned int reg, u8 *buf, si
 	return status < 0 ? status : -EREMOTEIO;
 }
 
-int stb0899_write_regs(struct stb0899_state *state, unsigned int reg, u8 *data, size_t count)
+int stb0899_write_regs(struct stb0899_state *state, unsigned int reg, u8 *data, u32 count)
 {
 	int ret;
 	u8 buf[2 + count];

diff --git a/trunk/drivers/media/dvb/frontends/stb0899_priv.h b/trunk/drivers/media/dvb/frontends/stb0899_priv.h
@@ -242,7 +242,7 @@ extern int stb0899_read_regs(struct stb0899_state *state,
 
 extern int stb0899_write_regs(struct stb0899_state *state,
 			      unsigned int reg, u8 *data,
-			      size_t count);
+			      u32 count);
 
 extern int stb0899_write_reg(struct stb0899_state *state,
 			     unsigned int reg,