diff options
| author | Patrick Boettcher <pb@linuxtv.org> | 2006-08-21 13:21:52 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-26 17:30:34 +0200 |
| commit | fb6065bbd915f9cf6022d52e114f5078654834b5 (patch) | |
| tree | 0717716f81a152e7fb0b3429a2c3abe69eb5a7a5 /drivers/media/dvb/frontends/dib3000mc.c | |
| parent | V4L/DVB (4529): Keep the PID parse bit when resetting the output mode (diff) | |
| download | linux-fb6065bbd915f9cf6022d52e114f5078654834b5.tar.xz linux-fb6065bbd915f9cf6022d52e114f5078654834b5.zip | |
V4L/DVB (4530): Another fix for the PID parsing
Still the pid_parse bit was erased.
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/frontends/dib3000mc.c')
| -rw-r--r-- | drivers/media/dvb/frontends/dib3000mc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c index 6d61237a450d..cc28417fa33a 100644 --- a/drivers/media/dvb/frontends/dib3000mc.c +++ b/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; |