From 6a0ff83ee1967fcfcb701056a34e9e2686720e37 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Date: Wed, 17 Feb 2010 12:00:01 +0200
Subject: [PATCH] --- yaml --- r: 184859 b: refs/heads/master c:
 b3f91eb8d8d17ad3ca5da4fa9f20d2e46133fd99 h: refs/heads/master i:   184857:
 4294ceab32d969c814de7038e84ad0545de7627f   184855:
 bd39ba2fbff11ae96794de34d8f94a1a35d7528b v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/video/omap2/omapfb/omapfb-main.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f50137009ffd..783609123529 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c121b15244c53637c3e9ca608b8816abcfbe2f8e
+refs/heads/master: b3f91eb8d8d17ad3ca5da4fa9f20d2e46133fd99
diff --git a/trunk/drivers/video/omap2/omapfb/omapfb-main.c b/trunk/drivers/video/omap2/omapfb/omapfb-main.c
index d17caef6915a..973bf7938086 100644
--- a/trunk/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/trunk/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2111,18 +2111,23 @@ static int 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) {
 		omap_dss_get_device(dssdev);
+
 		if (!dssdev->driver) {
 			dev_err(&pdev->dev, "no driver for display\n");
-			r = -EINVAL;
-			goto cleanup;
+			r = -ENODEV;
 		}
+
 		fbdev->displays[fbdev->num_displays++] = dssdev;
 	}
 
+	if (r)
+		goto cleanup;
+
 	if (fbdev->num_displays == 0) {
 		dev_err(&pdev->dev, "no displays\n");
 		r = -EINVAL;