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 / stv090x.c

diff --git a/drivers/media/dvb/frontends/stv090x.c b/drivers/media/dvb/frontends/stv090x.c
index 425e7a43ae19ea8d3ecb8da3eb776d71304050f6..4e0fc2c8a41c24eeabd940e8e79547547d1f6163 100644 (file)
--- a/drivers/media/dvb/frontends/stv090x.c
+++ b/drivers/media/dvb/frontends/stv090x.c
@@ -1483,8 +1483,8 @@ static int stv090x_start_search(struct stv090x_state *state)
                if (STV090x_WRITE_DEMOD(state, FFECFG, 0x41) < 0)
                        goto err;
 
-               if ((state->search_mode == STV090x_DVBS1)       ||
-                       (state->search_mode == STV090x_DSS)     ||
+               if ((state->search_mode == STV090x_SEARCH_DVBS1)        ||
+                       (state->search_mode == STV090x_SEARCH_DSS)      ||
                        (state->search_mode == STV090x_SEARCH_AUTO)) {
 
                        if (STV090x_WRITE_DEMOD(state, VITSCALE, 0x82) < 0)
@@ -2940,7 +2940,7 @@ static int stv090x_optimize_track(struct stv090x_state *state)
                STV090x_WRITE_DEMOD(state, ERRCTRL1, 0x67); /* PER */
                break;
 
-       case STV090x_UNKNOWN:
+       case STV090x_ERROR:
        default:
                reg = STV090x_READ_DEMOD(state, DMDCFGMD);
                STV090x_SETFIELD_Px(reg, DVBS1_ENABLE_FIELD, 1);