---

yaml --- r: 276864 b: refs/heads/master c: 71c7a97 h: refs/heads/master v: v3
git-mirror · Dec 7, 2011 · bfa6b6a · bfa6b6a
1 parent 33bb4e4
commit bfa6b6a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc8ac777ae39409e81f7dd2d123d980c0dfb528e
+refs/heads/master: 71c7a97289571ef5246b7f20d60b44961144c82f
diff --git a/trunk/drivers/media/video/omap/omap_vout.c b/trunk/drivers/media/video/omap/omap_vout.c
@@ -2169,6 +2169,14 @@ static int __init omap_vout_probe(struct platform_device *pdev)
 	vid_dev->num_displays = 0;
 	for_each_dss_dev(dssdev) {
 		omap_dss_get_device(dssdev);
+
+		if (!dssdev->driver) {
+			dev_warn(&pdev->dev, "no driver for display: %s\n",
+					dssdev->name);
+			omap_dss_put_device(dssdev);
+			continue;
+		}
+
 		vid_dev->displays[vid_dev->num_displays++] = dssdev;
 	}