---

yaml --- r: 179203 b: refs/heads/master c: 807a751 h: refs/heads/master i: 179201: edafeb7 179199: 682ff24 v: v3
git-mirror · Jan 12, 2010 · b7e4ed7 · b7e4ed7
1 parent 0894103
commit b7e4ed7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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;
 	}