From ee2b2412670e1958a2fff00bf69d44d4db79053c Mon Sep 17 00:00:00 2001
From: Michael Grzeschik <m.grzeschik@pengutronix.de>
Date: Tue, 3 Aug 2010 07:57:40 -0300
Subject: [PATCH] --- yaml --- r: 208182 b: refs/heads/master c:
 175bad921c75ab3b7d11a9fffc0e8d9a4a179e61 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6772852ac692..e58c98dee074 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8cf078ebd9f9b5ec3a113c8262062799fd9948a
+refs/heads/master: 175bad921c75ab3b7d11a9fffc0e8d9a4a179e61
diff --git a/trunk/drivers/media/video/mt9m111.c b/trunk/drivers/media/video/mt9m111.c
index 9f92d6353231..758a4db27d65 100644
--- a/trunk/drivers/media/video/mt9m111.c
+++ b/trunk/drivers/media/video/mt9m111.c
@@ -969,10 +969,6 @@ static int mt9m111_video_probe(struct soc_camera_device *icd,
 	mt9m111->swap_rgb_even_odd = 1;
 	mt9m111->swap_rgb_red_blue = 1;
 
-	ret = mt9m111_init(client);
-	if (ret)
-		goto ei2c;
-
 	data = reg_read(CHIP_VERSION);
 
 	switch (data) {
@@ -993,6 +989,8 @@ static int mt9m111_video_probe(struct soc_camera_device *icd,
 		goto ei2c;
 	}
 
+	ret = mt9m111_init(client);
+
 ei2c:
 	return ret;
 }