---

yaml --- r: 285415 b: refs/heads/master c: f428948 h: refs/heads/master i: 285413: 24dc6e7 285411: 79282f7 285407: df05f08 v: v3
git-mirror · Dec 30, 2011 · d8be7fe · d8be7fe
1 parent 00c54de
commit d8be7fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git 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
@@ -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)