From bfa6b6a1f60eb52c8bcdc967d3337c3ad37547cf Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Mon, 14 Nov 2011 04:28:59 -0300 Subject: [PATCH] --- yaml --- r: 276864 b: refs/heads/master c: 71c7a97289571ef5246b7f20d60b44961144c82f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/omap/omap_vout.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2d54a787db28..dd929e806d32 100644 --- 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 index 9c5c19f142de..2d2a136e465e 100644 --- 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; }