From: roel kluin <roel.kluin@gmail.com>
Date: Wed, 17 Dec 2008 17:01:07 +0000 (-0300)
Subject: V4L/DVB (10064): mt9m111: mt9m111_get_global_gain() - unsigned >= 0 is always true
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0f28b79346439ef5db130020aa07be9ca7c2ee84;p=linux-beck.git

V4L/DVB (10064): mt9m111: mt9m111_get_global_gain() - unsigned >= 0 is always true

unsigned >= 0 is always true and fix formula

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/mt9m111.c b/drivers/media/video/mt9m111.c
index 63c52c0b3e72..343be9252fe7 100644
--- a/drivers/media/video/mt9m111.c
+++ b/drivers/media/video/mt9m111.c
@@ -634,18 +634,15 @@ static int mt9m111_set_flip(struct soc_camera_device *icd, int flip, int mask)
 
 static int mt9m111_get_global_gain(struct soc_camera_device *icd)
 {
-	unsigned int data, gain;
+	int data;
 
 	data = reg_read(GLOBAL_GAIN);
 	if (data >= 0)
-		gain = ((data & (1 << 10)) * 2)
-			| ((data & (1 << 9)) * 2)
-			| (data & 0x2f);
-	else
-		gain = data;
-
-	return gain;
+		return (data & 0x2f) * (1 << ((data >> 10) & 1)) *
+			(1 << ((data >> 9) & 1));
+	return data;
 }
+
 static int mt9m111_set_global_gain(struct soc_camera_device *icd, int gain)
 {
 	u16 val;