Merge branch 'for-2.6.31' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[pandora-kernel.git] / drivers / staging / go7007 / wis-sony-tuner.c

diff --git a/drivers/staging/go7007/wis-sony-tuner.c b/drivers/staging/go7007/wis-sony-tuner.c
index c965c60..086896c 100644 (file)
--- a/drivers/staging/go7007/wis-sony-tuner.c
+++ b/drivers/staging/go7007/wis-sony-tuner.c
@@ -370,7 +370,7 @@ static int set_if(struct i2c_client *client)
        i2c_transfer(client->adapter, &msg, 1);
 
        /* Select MPX mode if not forced by the user */
-       if (force_mpx_mode >= 0 || force_mpx_mode < MPX_NUM_MODES)
+       if (force_mpx_mode >= 0 && force_mpx_mode < MPX_NUM_MODES)
                t->mpxmode = force_mpx_mode;
        else
                t->mpxmode = default_mpx_mode;