diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-01 06:53:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-01 06:53:41 -0400 |
| commit | c361cb59acbb503c033971e8be8c029bbfd67f18 (patch) | |
| tree | 51f38c226256b1b5590f28953b0e0a888871b14f /drivers/media | |
| parent | 6cf3c736200e3924d8ce6b37e5006a4598b9236d (diff) | |
| parent | 56c21b53ab071feb3ce93375a563ead745fa7105 (diff) | |
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.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"); |