summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorTomi Valkeinen2011-08-04 13:37:29 +0200
committerTomi Valkeinen2011-09-30 15:16:18 +0200
commitbab59b4417ea1380578358bedaeb714de6f1f6a7 (patch)
tree9d7a7f2731667fd99ccd0eb93831c215e027e614 /drivers/video
parentOMAP: DSS2: Implement dsi_mux_pads for OMAP4 (diff)
downloadkernel-qcow2-linux-bab59b4417ea1380578358bedaeb714de6f1f6a7.tar.gz
kernel-qcow2-linux-bab59b4417ea1380578358bedaeb714de6f1f6a7.tar.xz
kernel-qcow2-linux-bab59b4417ea1380578358bedaeb714de6f1f6a7.zip
OMAP: OMAPFB: make omapfb start even when a display is missing a driver
Currently omapfb wants that all the display devices have a driver, otherwise omapfb refuses to start. There's no real requirement to act like that, and this patch will make omapfb give a warning and skip that device. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap2/omapfb/omapfb-main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index e5a64b38e52a..cd2cae8e96ff 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/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++];