Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / drivers / gpu / drm / drm_connector.c

diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index 8be60a4576b3f2c9099a175d6bfe08dd3aa8b0c7..7a7019ac93884eeeba046ad62b3c81037796beb7 100644 (file)
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -379,6 +379,9 @@ int drm_connector_register(struct drm_connector *connector)
 {
        int ret = 0;
 
+       if (!connector->dev->registered)
+               return 0;
+
        mutex_lock(&connector->mutex);
        if (connector->registered)
                goto unlock;