From e5912fc19445cdb0ca00fbf489ff2c48c8d387ab Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Fri, 28 Oct 2011 19:58:17 -0300
Subject: [PATCH] --- yaml --- r: 285171 b: refs/heads/master c:
 49a0513c1fca2c43b14416f3f40220fa01ab5e39 h: refs/heads/master i:   285169:
 24817ad2a057850f1e617ca725e00bd4d4c16b41   285167:
 7e0a39ca611c7806979537da2318bcc3a8d6be06 v: v3

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

diff --git a/[refs] b/[refs]
index 600e0d0d6f0a..ff875ce2b06a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a4524d726cd4d109c57fc194a55ff0a9e4df0e9
+refs/heads/master: 49a0513c1fca2c43b14416f3f40220fa01ab5e39
diff --git a/trunk/drivers/media/video/davinci/vpbe_display.c b/trunk/drivers/media/video/davinci/vpbe_display.c
index 8588a86d9b45..d98da4bfb256 100644
--- a/trunk/drivers/media/video/davinci/vpbe_display.c
+++ b/trunk/drivers/media/video/davinci/vpbe_display.c
@@ -1746,15 +1746,16 @@ static __devinit int vpbe_display_probe(struct platform_device *pdev)
 	for (i = 0; i < VPBE_DISPLAY_MAX_DEVICES; i++) {
 		if (register_device(disp_dev->dev[i], disp_dev, pdev)) {
 			err = -ENODEV;
-			goto probe_out;
+			goto probe_out_irq;
 		}
 	}
 
 	printk(KERN_DEBUG "Successfully completed the probing of vpbe v4l2 device\n");
 	return 0;
 
-probe_out:
+probe_out_irq:
 	free_irq(res->start, disp_dev);
+probe_out:
 	for (k = 0; k < VPBE_DISPLAY_MAX_DEVICES; k++) {
 		/* Get the pointer to the layer object */
 		vpbe_display_layer = disp_dev->dev[k];