Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / media / video / msp3400-kthreads.c

diff --git a/drivers/media/video/msp3400-kthreads.c b/drivers/media/video/msp3400-kthreads.c
index 61ec794..1622f70 100644 (file)
--- a/drivers/media/video/msp3400-kthreads.c
+++ b/drivers/media/video/msp3400-kthreads.c
@@ -480,7 +480,6 @@ int msp3400c_thread(void *data)
        struct msp3400c_carrier_detect *cd;
        int count, max1, max2, val1, val2, val, i;
 
-
        v4l_dbg(1, msp_debug, client, "msp3400 daemon started\n");
        set_freezable();
        for (;;) {
@@ -833,11 +832,6 @@ static int msp34xxg_modus(struct i2c_client *client)
                v4l_dbg(1, msp_debug, client, "selected radio modus\n");
                return 0x0001;
        }
-
-       if (state->v4l2_std & V4L2_STD_PAL) {
-               v4l_dbg(1, msp_debug, client, "selected PAL modus\n");
-               return 0x7001;
-       }
        if (state->v4l2_std == V4L2_STD_NTSC_M_JP) {
                v4l_dbg(1, msp_debug, client, "selected M (EIA-J) modus\n");
                return 0x4001;
@@ -846,15 +840,15 @@ static int msp34xxg_modus(struct i2c_client *client)
                v4l_dbg(1, msp_debug, client, "selected M (A2) modus\n");
                return 0x0001;
        }
+       if (state->v4l2_std == V4L2_STD_SECAM_L) {
+               v4l_dbg(1, msp_debug, client, "selected SECAM-L modus\n");
+               return 0x6001;
+       }
        if (state->v4l2_std & V4L2_STD_MN) {
                v4l_dbg(1, msp_debug, client, "selected M (BTSC) modus\n");
                return 0x2001;
        }
-       if (state->v4l2_std & V4L2_STD_SECAM) {
-               v4l_dbg(1, msp_debug, client, "selected SECAM modus\n");
-               return 0x6001;
-       }
-       return 0x0001;
+       return 0x7001;
 }
 
 static void msp34xxg_set_source(struct i2c_client *client, u16 reg, int in)