summaryrefslogtreecommitdiff
path: root/drivers/staging/omapdrm/omap_connector.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/omapdrm/omap_connector.c')
-rw-r--r--drivers/staging/omapdrm/omap_connector.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/staging/omapdrm/omap_connector.c b/drivers/staging/omapdrm/omap_connector.c
index f02d3daaff4f..65e0b4a0fdfd 100644
--- a/drivers/staging/omapdrm/omap_connector.c
+++ b/drivers/staging/omapdrm/omap_connector.c
@@ -101,6 +101,11 @@ enum drm_connector_status omap_connector_detect(
struct omap_dss_driver *dssdrv = dssdev->driver;
enum drm_connector_status ret;
+ if (!dss_runtime_pm_enabled()) {
+ pr_err("*** drm connector poll occurred in resume, claiming it's disconnected\n");
+ return connector_status_disconnected;
+ }
+
if (dssdrv->detect(dssdev))
ret = connector_status_connected;
else