---

yaml --- r: 344647 b: refs/heads/master c: 4ee9a53 h: refs/heads/master i: 344645: a4edca1 344643: 26cd47b 344639: e4669a8 v: v3
git-mirror · Nov 19, 2012 · 2c6ef84 · 2c6ef84
1 parent 09166cd
commit 2c6ef84
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcca5cf07bcd355e4e1bd51609efe7b7d5d0a7b8
+refs/heads/master: 4ee9a5377b7888fae8aa6064e4cc8d0fd32871a2
diff --git a/trunk/drivers/video/omap2/omapfb/omapfb-main.c b/trunk/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2445,7 +2445,6 @@ static int __init omapfb_probe(struct platform_device *pdev)
 	fbdev->dev = &pdev->dev;
 	platform_set_drvdata(pdev, fbdev);
 
-	r = 0;
 	fbdev->num_displays = 0;
 	dssdev = NULL;
 	for_each_dss_dev(dssdev) {
@@ -2468,9 +2467,6 @@ static int __init omapfb_probe(struct platform_device *pdev)
 			d->update_mode = OMAPFB_AUTO_UPDATE;
 	}
 
-	if (r)
-		goto cleanup;
-
 	if (fbdev->num_displays == 0) {
 		dev_err(&pdev->dev, "no displays\n");
 		r = -EINVAL;