aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-01 19:53:41 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-01 19:53:41 +0900
commitc361cb59acbb503c033971e8be8c029bbfd67f18 (patch)
tree51f38c226256b1b5590f28953b0e0a888871b14f /drivers/media
parent6cf3c736200e3924d8ce6b37e5006a4598b9236d (diff)
parent56c21b53ab071feb3ce93375a563ead745fa7105 (diff)
downloadvexpress-lsk-c361cb59acbb503c033971e8be8c029bbfd67f18.tar.gz
Merge tag 'fbdev-for-3.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev
Pull fbdev fixes from Jean-Christophe PLAGNIOL-VILLARD: "This contains some small fixes - Atmel LCDC: fix blank the backlight on remove - ps3fb: fix compile warning - OMAPDSS: Fix crash with DT boot" * tag 'fbdev-for-3.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev: atmel_lcdfb: blank the backlight on remove trivial: atmel_lcdfb: add missing error message OMAPDSS: Fix crash with DT boot fbdev/ps3fb: fix compile warning
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/omap/omap_vout.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
index 477268a2415..d338b19da54 100644
--- a/drivers/media/platform/omap/omap_vout.c
+++ b/drivers/media/platform/omap/omap_vout.c
@@ -2150,6 +2150,9 @@ static int __init omap_vout_probe(struct platform_device *pdev)
struct omap_dss_device *def_display;
struct omap2video_device *vid_dev = NULL;
+ if (omapdss_is_initialized() == false)
+ return -EPROBE_DEFER;
+
ret = omapdss_compat_init();
if (ret) {
dev_err(&pdev->dev, "failed to init dss\n");