]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
V4L/DVB (4530): Another fix for the PID parsing
authorPatrick Boettcher <pb@linuxtv.org>
Mon, 21 Aug 2006 11:21:52 +0000 (08:21 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Tue, 26 Sep 2006 15:30:34 +0000 (12:30 -0300)
Still the pid_parse bit was erased.

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/dvb/frontends/dib3000mc.c

index 6d61237a450d74ad431613e8ad9869b959ac9ab1..cc28417fa33ac7fb6bc1eef2e496cd0ec682ec6e 100644 (file)
@@ -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;