---

yaml --- r: 330866 b: refs/heads/master c: edff996 h: refs/heads/master v: v3
git-mirror · Aug 15, 2012 · 818ac2d · 818ac2d
1 parent 7670e81
commit 818ac2d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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;
 }