1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index c7dbf30a61fa..ad8d16cf819c 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -250,7 +250,9 @@ static int omap_connect_dssdevs(void)
 {
         int r;
         struct omap_dss_device *dssdev = NULL;
-        bool no_displays = true;
+
+        if (!omapdss_stack_is_ready())
+                return -EPROBE_DEFER;
 
         for_each_dss_dev(dssdev) {
                 r = dssdev->driver->connect(dssdev);
@@ -260,14 +262,9 @@ static int omap_connect_dssdevs(void)
                 } else if (r) {
                         dev_warn(dssdev->dev, "could not connect display: %s\n",
                                 dssdev->name);
-                } else {
-                        no_displays = false;
                 }
         }
 
-        if (no_displays)
-                return -EPROBE_DEFER;
-
         return 0;
 
 cleanup: