---

yaml --- r: 330874 b: refs/heads/master c: dc5d598 h: refs/heads/master v: v3
git-mirror · Aug 15, 2012 · 83c9888 · 83c9888
1 parent 147b680
commit 83c9888
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ead963009f295dc8589720d22fa4fb288be9edb
+refs/heads/master: dc5d598219ed5e914ec139d8c82d0866cdb7b8ce
diff --git a/trunk/drivers/media/i2c/soc_camera/ov772x.c b/trunk/drivers/media/i2c/soc_camera/ov772x.c
@@ -541,9 +541,15 @@ static int ov772x_mask_set(struct i2c_client *client, u8  command, u8  mask,
 
 static int ov772x_reset(struct i2c_client *client)
 {
-	int ret = ov772x_write(client, COM7, SCCB_RESET);
+	int ret;
+
+	ret = ov772x_write(client, COM7, SCCB_RESET);
+	if (ret < 0)
+		return ret;
+
 	msleep(1);
-	return ret;
+
+	return ov772x_mask_set(client, COM2, SOFT_SLEEP_MODE, SOFT_SLEEP_MODE);
 }
 
 /*