From 818ac2da6a0ae64e8bbaae179b3d72c126f7e889 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Wed, 18 Jul 2012 10:58:18 -0300
Subject: [PATCH] --- yaml --- r: 330866 b: refs/heads/master c:
 edff996eb942ce5595e9b60a0e06586dcc41b19b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index dde20a374bcf..c454306875cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bbc6d52e61a8a9c19fcc859c4acab89cb8cd4e5
+refs/heads/master: edff996eb942ce5595e9b60a0e06586dcc41b19b
diff --git a/trunk/drivers/media/i2c/soc_camera/ov772x.c b/trunk/drivers/media/i2c/soc_camera/ov772x.c
index 641f6f43d7ee..0fede50dde4b 100644
--- a/trunk/drivers/media/i2c/soc_camera/ov772x.c
+++ b/trunk/drivers/media/i2c/soc_camera/ov772x.c
@@ -1098,18 +1098,17 @@ static int ov772x_probe(struct i2c_client *client,
 			V4L2_CID_BAND_STOP_FILTER, 0, 256, 1, 0);
 	priv->subdev.ctrl_handler = &priv->hdl;
 	if (priv->hdl.error) {
-		int err = priv->hdl.error;
-
-		kfree(priv);
-		return err;
+		ret = priv->hdl.error;
+		goto done;
 	}
 
 	ret = ov772x_video_probe(client);
+
+done:
 	if (ret) {
 		v4l2_ctrl_handler_free(&priv->hdl);
 		kfree(priv);
 	}
-
 	return ret;
 }