From: Roel Kluin <roel.kluin@gmail.com>
Date: Tue, 12 May 2009 20:50:24 +0000 (-0700)
Subject: staging: wis-sony-tuner.c: fix &&/|| error
X-Git-Tag: v2.6.31-rc1~105^2~43
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=315d7fa9d60fb402b1331fe5e83d9295f4c6cf0f;p=platform%2Fkernel%2Flinux-stable.git

staging: wis-sony-tuner.c: fix &&/|| error

Fix &&/|| typo

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/go7007/wis-sony-tuner.c b/drivers/staging/go7007/wis-sony-tuner.c
index c965c60..086896c 100644
--- 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;