From 787bd03d402f038b005e0f2826cf4d5b2351284e Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 4 Aug 2011 14:37:29 +0300 Subject: [PATCH] --- yaml --- r: 271376 b: refs/heads/master c: bab59b4417ea1380578358bedaeb714de6f1f6a7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/omapfb/omapfb-main.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 567375370942..5dd88fb6d7d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc35835c6f4bf3f15b68c723c9b7540cf11b9ad6 +refs/heads/master: bab59b4417ea1380578358bedaeb714de6f1f6a7 diff --git a/trunk/drivers/video/omap2/omapfb/omapfb-main.c b/trunk/drivers/video/omap2/omapfb/omapfb-main.c index e5a64b38e52a..cd2cae8e96ff 100644 --- a/trunk/drivers/video/omap2/omapfb/omapfb-main.c +++ b/trunk/drivers/video/omap2/omapfb/omapfb-main.c @@ -2373,9 +2373,10 @@ static int omapfb_probe(struct platform_device *pdev) omap_dss_get_device(dssdev); if (!dssdev->driver) { - dev_err(&pdev->dev, "no driver for display: %s\n", + dev_warn(&pdev->dev, "no driver for display: %s\n", dssdev->name); - r = -ENODEV; + omap_dss_put_device(dssdev); + continue; } d = &fbdev->displays[fbdev->num_displays++];