summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
authorPatrick Boettcher <pb@linuxtv.org>2006-08-21 13:21:52 +0200
committerPatrick Boettcher <pb@linuxtv.org>2006-08-21 13:21:52 +0200
commite906ca813e0536a9b132343dddfc5e4525751d51 (patch)
tree4c45a401b9b13a2e409664b9ab3bbf3e3d665d73 /linux/drivers/media
parentcb1670379261b49a5d8ed2fa6411a9e6120dd3a3 (diff)
downloadmediapointer-dvb-s2-e906ca813e0536a9b132343dddfc5e4525751d51.tar.gz
mediapointer-dvb-s2-e906ca813e0536a9b132343dddfc5e4525751d51.tar.bz2
Another fix for the PID parsing
From: Patrick Boettcher <pb@linuxtv.org> Still the pid_parse bit was erased. Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Diffstat (limited to 'linux/drivers/media')
-rw-r--r--linux/drivers/media/dvb/frontends/dib3000mc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/frontends/dib3000mc.c b/linux/drivers/media/dvb/frontends/dib3000mc.c
index 60998908a..aee6c56bc 100644
--- a/linux/drivers/media/dvb/frontends/dib3000mc.c
+++ b/linux/drivers/media/dvb/frontends/dib3000mc.c
@@ -193,8 +193,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);
@@ -222,7 +221,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;