From d8be7fe50b9dae5240bda673d15887264bd273ce Mon Sep 17 00:00:00 2001
From: Sylwester Nawrocki <s.nawrocki@samsung.com>
Date: Tue, 15 Nov 2011 15:55:17 -0300
Subject: [PATCH] --- yaml --- r: 285415 b: refs/heads/master c:
 f428948b98e3b9476057ee483e7e763a5ac61a69 h: refs/heads/master i:   285413:
 24dc6e7533fbbe8cc269342b4623b33f076933f4   285411:
 79282f7ff63a359e5b01fcd7695db478db4cbd31   285407:
 df05f0802063c12598e04b265d78590f8991c2fe v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/media/video/m5mols/m5mols_core.c | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 9fbd8caf762b..3b2d438dc1fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa1f4601ed35820a9bd720cc5b1e3fe3c4ff7c5f
+refs/heads/master: f428948b98e3b9476057ee483e7e763a5ac61a69
diff --git a/trunk/drivers/media/video/m5mols/m5mols_core.c b/trunk/drivers/media/video/m5mols/m5mols_core.c
index ea594cf0fa56..12f223f3d0fd 100644
--- a/trunk/drivers/media/video/m5mols/m5mols_core.c
+++ b/trunk/drivers/media/video/m5mols/m5mols_core.c
@@ -864,13 +864,6 @@ static int m5mols_s_power(struct v4l2_subdev *sd, int on)
 		ret = m5mols_sensor_power(info, true);
 		if (!ret)
 			ret = m5mols_fw_start(sd);
-		if (ret)
-			return ret;
-
-		info->ffmt[M5MOLS_RESTYPE_MONITOR] =
-			m5mols_default_ffmt[M5MOLS_RESTYPE_MONITOR];
-		info->ffmt[M5MOLS_RESTYPE_CAPTURE] =
-			m5mols_default_ffmt[M5MOLS_RESTYPE_CAPTURE];
 		return ret;
 	}
 
@@ -1007,6 +1000,8 @@ static int __devinit m5mols_probe(struct i2c_client *client,
 		goto out_me;
 	}
 	info->res_type = M5MOLS_RESTYPE_MONITOR;
+	info->ffmt[0] = m5mols_default_ffmt[0];
+	info->ffmt[1] =	m5mols_default_ffmt[1];
 
 	ret = m5mols_sensor_power(info, true);
 	if (ret)