From 0fb051482fd96c5ca1ed6d68a32b72a54da9c247 Mon Sep 17 00:00:00 2001
From: Patrick Boettcher <pb@linuxtv.org>
Date: Mon, 21 Aug 2006 08:21:52 -0300
Subject: [PATCH] --- yaml --- r: 37431 b: refs/heads/master c:
 fb6065bbd915f9cf6022d52e114f5078654834b5 h: refs/heads/master i:   37429:
 e9b432253918fa303e0ae585e923251434abf7e6   37427:
 4cfebdaffba4dc637be87111d47ca68a64a48c5d   37423:
 4d7ce3a117c4646350895a9d46909c2c38da2602 v: v3

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

diff --git a/[refs] b/[refs]
index d7abcd454b7a..19f63898d80d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 559463bba8b91d36b12f6722dc27440567e4f6be
+refs/heads/master: fb6065bbd915f9cf6022d52e114f5078654834b5
diff --git a/trunk/drivers/media/dvb/frontends/dib3000mc.c b/trunk/drivers/media/dvb/frontends/dib3000mc.c
index 6d61237a450d..cc28417fa33a 100644
--- a/trunk/drivers/media/dvb/frontends/dib3000mc.c
+++ b/trunk/drivers/media/dvb/frontends/dib3000mc.c
@@ -169,8 +169,7 @@ static int dib3000mc_set_output_mode(struct dib3000mc_state *state, int mode)
 	u16 outreg = 0;
 	u16 outmode = 0;
 	u16 elecout = 1;
-	u16 smo_reg = (0 << 6) | (0 << 5) | (0 << 3) | (1 << 1) | 0 |
-		(dib3000mc_read_word(state, 206) & 0x0010); /* keep the pid_parse bit */
+	u16 smo_reg = dib3000mc_read_word(state, 206) & 0x0010; /* keep the pid_parse bit */
 
 	dprintk("-I-  Setting output mode for demod %p to %d\n",
 			&state->demod, mode);
@@ -198,7 +197,7 @@ static int dib3000mc_set_output_mode(struct dib3000mc_state *state, int mode)
 			P_smo_mode           [2;2:1] = 11
 			P_smo_ovf_prot       [1;0:0] = 0
 			*/
-			smo_reg = (0 << 6) | (0 << 5) | (0 << 3) |(3 << 1) | 0;
+			smo_reg |= 3 << 1;
 			fifo_threshold = 512;
 			outmode = 5;
 			break;