[media] dib8000: Fix handling of interleave bigger than 2

If interleave is bigger than 2, the code will set it to 0, as
dib8000 registers use a log2(). So, change the code to handle
it accordingly.

Acked-By: Patrick Boettcher <pboettcher@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/dvb-frontends/dib8000.c b/drivers/media/dvb-frontends/dib8000.c
index 270a58e3e837c2a6b5b1b609d7ee39f1b8669e44..78ccbe13d189f7b95044770b78b4220099a9bcec 100644 (file)
--- a/drivers/media/dvb-frontends/dib8000.c
+++ b/drivers/media/dvb-frontends/dib8000.c
@@ -2033,9 +2033,8 @@ static u16 dib8000_set_layer(struct dib8000_state *state, u8 layer_index, u16 ma
                        break;
        }
 
-       if ((c->layer[layer_index].interleaving > 0) && ((c->layer[layer_index].interleaving <= 3) || (c->layer[layer_index].interleaving == 4 && c->isdbt_sb_mode == 1)))
-               time_intlv = c->layer[layer_index].interleaving;
-       else
+       time_intlv = fls(c->layer[layer_index].interleaving);
+       if (time_intlv > 3 && !(time_intlv == 4 && c->isdbt_sb_mode == 1))
                time_intlv = 0;
 
        dib8000_write_word(state, 2 + layer_index, (constellation << 10) | ((c->layer[layer_index].segment_count & 0xf) << 6) | (cr << 3) | time_intlv);