From 8d2c978938c8455dca93acad06d55f1ca9de129a Mon Sep 17 00:00:00 2001
From: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
Date: Fri, 10 May 2013 00:48:38 -0300
Subject: [PATCH] --- yaml --- r: 377168 b: refs/heads/master c:
 39e219d9292958460c3229df29995454414ce626 h: refs/heads/master v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/media/platform/davinci/vpfe_capture.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c5b919d322ca..5487e2c8df2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bdea0d222a21f864a811cf6666532334e622f7c6
+refs/heads/master: 39e219d9292958460c3229df29995454414ce626
diff --git a/trunk/drivers/media/platform/davinci/vpfe_capture.c b/trunk/drivers/media/platform/davinci/vpfe_capture.c
index 8c50d3074866..3827fe1e2692 100644
--- a/trunk/drivers/media/platform/davinci/vpfe_capture.c
+++ b/trunk/drivers/media/platform/davinci/vpfe_capture.c
@@ -1837,7 +1837,7 @@ static int vpfe_probe(struct platform_device *pdev)
 	if (NULL == ccdc_cfg) {
 		v4l2_err(pdev->dev.driver,
 			 "Memory allocation failed for ccdc_cfg\n");
-		goto probe_free_lock;
+		goto probe_free_dev_mem;
 	}
 
 	mutex_lock(&ccdc_lock);