---

yaml --- r: 285171 b: refs/heads/master c: 49a0513 h: refs/heads/master i: 285169: 24817ad 285167: 7e0a39c v: v3
git-mirror · Nov 7, 2011 · e5912fc · e5912fc
1 parent d6f0446
commit e5912fc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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];