From 4020aef5b97eae58e8e3230cf08372137ceb62e4 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Fri, 23 Dec 2011 13:39:32 -0300
Subject: [PATCH] --- yaml --- r: 285718 b: refs/heads/master c:
 75e5ac7ea57ea56628f73a8a0aaf58f758aae43a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0118ea33d7de..77ed73c184dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aecf33db58cbcb40299a7630b3b6c89aa126fcb6
+refs/heads/master: 75e5ac7ea57ea56628f73a8a0aaf58f758aae43a
diff --git a/trunk/drivers/media/video/davinci/vpbe.c b/trunk/drivers/media/video/davinci/vpbe.c
index c12a714c080c..1cc254d52a41 100644
--- a/trunk/drivers/media/video/davinci/vpbe.c
+++ b/trunk/drivers/media/video/davinci/vpbe.c
@@ -853,8 +853,10 @@ static __devinit int vpbe_probe(struct platform_device *pdev)
 
 	if (cfg->outputs->num_modes > 0)
 		vpbe_dev->current_timings = vpbe_dev->cfg->outputs[0].modes[0];
-	else
+	else {
+		kfree(vpbe_dev);
 		return -ENODEV;
+	}
 
 	/* set the driver data in platform device */
 	platform_set_drvdata(pdev, vpbe_dev);