Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / dvb / frontends / dib7000p.c

diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c
index 3aed0d43392152688bbe4176ebc8ee68712ab724..6aa02cb80733b2abf8458a3fac6576e2f4e3628a 100644 (file)
--- a/drivers/media/dvb/frontends/dib7000p.c
+++ b/drivers/media/dvb/frontends/dib7000p.c
@@ -717,7 +717,7 @@ static void dib7000p_set_channel(struct dib7000p_state *state, struct dvb_fronte
        value = 0;
        switch (ch->u.ofdm.transmission_mode) {
                case TRANSMISSION_MODE_2K: value |= (0 << 7); break;
-               case /* 4K MODE */ 255: value |= (2 << 7); break;
+               case TRANSMISSION_MODE_4K: value |= (2 << 7); break;
                default:
                case TRANSMISSION_MODE_8K: value |= (1 << 7); break;
        }
@@ -770,7 +770,7 @@ static void dib7000p_set_channel(struct dib7000p_state *state, struct dvb_fronte
        /* P_dvsy_sync_wait */
        switch (ch->u.ofdm.transmission_mode) {
                case TRANSMISSION_MODE_8K: value = 256; break;
-               case /* 4K MODE */ 255: value = 128; break;
+               case TRANSMISSION_MODE_4K: value = 128; break;
                case TRANSMISSION_MODE_2K:
                default: value = 64; break;
        }
@@ -994,7 +994,7 @@ static int dib7000p_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet
        tmp = (6 << 8) | 0x80;
        switch (ch->u.ofdm.transmission_mode) {
                case TRANSMISSION_MODE_2K: tmp |= (7 << 12); break;
-               case /* 4K MODE */ 255: tmp |= (8 << 12); break;
+               case TRANSMISSION_MODE_4K: tmp |= (8 << 12); break;
                default:
                case TRANSMISSION_MODE_8K: tmp |= (9 << 12); break;
        }
@@ -1004,7 +1004,7 @@ static int dib7000p_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet
        tmp = (0 << 4);
        switch (ch->u.ofdm.transmission_mode) {
                case TRANSMISSION_MODE_2K: tmp |= 0x6; break;
-               case /* 4K MODE */ 255: tmp |= 0x7; break;
+               case TRANSMISSION_MODE_4K: tmp |= 0x7; break;
                default:
                case TRANSMISSION_MODE_8K: tmp |= 0x8; break;
        }
@@ -1014,7 +1014,7 @@ static int dib7000p_tune(struct dvb_frontend *demod, struct dvb_frontend_paramet
        tmp = (0 << 4);
        switch (ch->u.ofdm.transmission_mode) {
                case TRANSMISSION_MODE_2K: tmp |= 0x6; break;
-               case /* 4K MODE */ 255: tmp |= 0x7; break;
+               case TRANSMISSION_MODE_4K: tmp |= 0x7; break;
                default:
                case TRANSMISSION_MODE_8K: tmp |= 0x8; break;
        }