From 22e043093b211b2df9a70a55c4a1632ffa6b522f Mon Sep 17 00:00:00 2001
From: roel kluin <roel.kluin@gmail.com>
Date: Wed, 17 Dec 2008 14:01:07 -0300
Subject: [PATCH] --- yaml --- r: 124535 b: refs/heads/master c:
 0f28b79346439ef5db130020aa07be9ca7c2ee84 h: refs/heads/master i:   124533:
 d16e836c6f3c72d216556d48e99cacbaebc6cb63   124531:
 1b867d9330ef4571b600f3478d7f58ce28bef6c8   124527:
 fdb2bb6a5ea1c7e9eec34e8975106f84c4f53b9a v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/media/video/mt9m111.c | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 62126dc330c2..1118e10d940b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d25cb6461ac93683ac04b2e181bcaa0cc15c349b
+refs/heads/master: 0f28b79346439ef5db130020aa07be9ca7c2ee84
diff --git a/trunk/drivers/media/video/mt9m111.c b/trunk/drivers/media/video/mt9m111.c
index 63c52c0b3e72..343be9252fe7 100644
--- a/trunk/drivers/media/video/mt9m111.c
+++ b/trunk/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;