From c5e7fdeb10c8aa68c548ca206162afb7feb7a3be Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Date: Mon, 29 Dec 2008 06:04:37 -0300
Subject: [PATCH] --- yaml --- r: 124568 b: refs/heads/master c:
 77fe3d4a44f76653263eb8671d7909ab0fdafd71 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 90166db95742..6d3c6266db48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7dcb212eee1d3833073ba0458ca5a603b7b05cc5
+refs/heads/master: 77fe3d4a44f76653263eb8671d7909ab0fdafd71
diff --git a/trunk/drivers/media/video/ov772x.c b/trunk/drivers/media/video/ov772x.c
index e7fb553c906e..b3346c934bf3 100644
--- a/trunk/drivers/media/video/ov772x.c
+++ b/trunk/drivers/media/video/ov772x.c
@@ -942,8 +942,10 @@ static int ov772x_probe(struct i2c_client *client,
 
 	ret = soc_camera_device_register(icd);
 
-	if (ret)
+	if (ret) {
+		i2c_set_clientdata(client, NULL);
 		kfree(priv);
+	}
 
 	return ret;
 }
@@ -953,6 +955,7 @@ static int ov772x_remove(struct i2c_client *client)
 	struct ov772x_priv *priv = i2c_get_clientdata(client);
 
 	soc_camera_device_unregister(&priv->icd);
+	i2c_set_clientdata(client, NULL);
 	kfree(priv);
 	return 0;
 }