From dbd2fddb69aa05930c1f9b492651d7485b0cc9df Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Fri, 10 May 2013 07:53:08 -0300
Subject: [PATCH] --- yaml --- r: 377173 b: refs/heads/master c:
 a2ac2d792cb6a22eb86ef4e026ba74c3ea6e67ee h: refs/heads/master i:   377171:
 c4818f954f9bc1f81070f1ab4baa8bc110b8ac74 v: v3

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

diff --git a/[refs] b/[refs]
index d79d39e4220d..7e513cf9bd83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e7df1cd373d688486b0b0b6626cb32f59ebdcfa
+refs/heads/master: a2ac2d792cb6a22eb86ef4e026ba74c3ea6e67ee
diff --git a/trunk/drivers/media/platform/davinci/vpfe_capture.c b/trunk/drivers/media/platform/davinci/vpfe_capture.c
index 3827fe1e2692..93609091cb23 100644
--- a/trunk/drivers/media/platform/davinci/vpfe_capture.c
+++ b/trunk/drivers/media/platform/davinci/vpfe_capture.c
@@ -1991,7 +1991,6 @@ static int vpfe_probe(struct platform_device *pdev)
 	free_irq(vpfe_dev->ccdc_irq0, vpfe_dev);
 probe_free_ccdc_cfg_mem:
 	kfree(ccdc_cfg);
-probe_free_lock:
 	mutex_unlock(&ccdc_lock);
 probe_free_dev_mem:
 	kfree(vpfe_dev);