From b7e4ed7baf800a0704165718b6c4da7077da1d7f Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Date: Thu, 7 Jan 2010 17:45:03 +0200
Subject: [PATCH] --- yaml --- r: 179203 b: refs/heads/master c:
 807a7515aea421f2b340140482ed4c8811c523c6 h: refs/heads/master i:   179201:
 edafeb77cdbc03e7d6b3e17e78ec7b7671581c2b   179199:
 682ff24c12e4110bb9a74c499bca72b14dd1b926 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/video/omap2/omapfb/omapfb-main.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 98c2327cefb4..39ef7cc3a711 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d9c5597ad1408885fdef5838aa27a8a0ee9e915
+refs/heads/master: 807a7515aea421f2b340140482ed4c8811c523c6
diff --git a/trunk/drivers/video/omap2/omapfb/omapfb-main.c b/trunk/drivers/video/omap2/omapfb/omapfb-main.c
index e61a75c31358..d17caef6915a 100644
--- a/trunk/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/trunk/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2115,6 +2115,11 @@ static int omapfb_probe(struct platform_device *pdev)
 	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;
+		}
 		fbdev->displays[fbdev->num_displays++] = dssdev;
 	}