diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-05-29 13:00:34 +0400 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-05-29 13:00:34 +0400 |
| commit | 2436e8aa8abef2536dc3bfb554f8dcb3a8b07560 (patch) | |
| tree | 7e5e4b6447a2c3864ac1a5a2cf619881d8d069d5 /drivers/media/platform/omap | |
| parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
| parent | 591a0ac7f14aae6bf11b1cb6b5a68480bd644ddb (diff) | |
| download | linux-2436e8aa8abef2536dc3bfb554f8dcb3a8b07560.tar.xz | |
Merge branch 'fbdev-3.10-fixes' of git://gitorious.org/linux-omap-dss2/linux into linux-fbdev/for-3.10-fixes
Pull Tomi fixes for ps3fb and omap2
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'drivers/media/platform/omap')
| -rw-r--r-- | drivers/media/platform/omap/omap_vout.c | 3 |
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 477268a2415f..d338b19da544 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"); |