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/gpu/drm/omapdrm/omap_drv.c | |
| parent | 82c5cde1c4b01a62c9a19c9118b4b434c333ce86 (diff) | |
| parent | 49006bfd31f728a0dfdef6ef41635f0e6c546155 (diff) | |
Merge branch 'am33xx' into omap-for-v3.11/cleanup
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_drv.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_drv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index 9c53c25e5201..826586ffbe83 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c | |||
| @@ -649,6 +649,9 @@ static void pdev_shutdown(struct platform_device *device) | |||
| 649 | 649 | ||
| 650 | static int pdev_probe(struct platform_device *device) | 650 | static int pdev_probe(struct platform_device *device) |
| 651 | { | 651 | { |
| 652 | if (omapdss_is_initialized() == false) | ||
| 653 | return -EPROBE_DEFER; | ||
| 654 | |||
| 652 | DBG("%s", device->name); | 655 | DBG("%s", device->name); |
| 653 | return drm_platform_init(&omap_drm_driver, device); | 656 | return drm_platform_init(&omap_drm_driver, device); |
| 654 | } | 657 | } |