diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-06-07 12:12:25 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-06-07 12:12:25 -0400 |
| commit | bea6412a994a8f49d81bc103907563ab9f94c371 (patch) | |
| tree | 93afcafccce0f149d4221ec4bb6156dcdafdb0e5 /drivers/media/platform/omap/omap_vout.c | |
| parent | 82c5cde1c4b01a62c9a19c9118b4b434c333ce86 (diff) | |
| parent | 49006bfd31f728a0dfdef6ef41635f0e6c546155 (diff) | |
Merge branch 'am33xx' into omap-for-v3.11/cleanup
Diffstat (limited to 'drivers/media/platform/omap/omap_vout.c')
| -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) | |||
| 2150 | struct omap_dss_device *def_display; | 2150 | struct omap_dss_device *def_display; |
| 2151 | struct omap2video_device *vid_dev = NULL; | 2151 | struct omap2video_device *vid_dev = NULL; |
| 2152 | 2152 | ||
| 2153 | if (omapdss_is_initialized() == false) | ||
| 2154 | return -EPROBE_DEFER; | ||
| 2155 | |||
| 2153 | ret = omapdss_compat_init(); | 2156 | ret = omapdss_compat_init(); |
| 2154 | if (ret) { | 2157 | if (ret) { |
| 2155 | dev_err(&pdev->dev, "failed to init dss\n"); | 2158 | dev_err(&pdev->dev, "failed to init dss\n"); |