UPSTREAM: drm: WARN() when drm_connector_attach_property fails

[cascardo/linux.git] / drivers / gpu / drm / drm_crtc.c

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index a153922..69858ad 100644 (file)
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -2830,7 +2830,7 @@ void drm_property_destroy(struct drm_device *dev, struct drm_property *property)
 }
 EXPORT_SYMBOL(drm_property_destroy);
 
-int drm_connector_attach_property(struct drm_connector *connector,
+void drm_connector_attach_property(struct drm_connector *connector,
                               struct drm_property *property, uint64_t init_val)
 {
        int i;
@@ -2839,13 +2839,13 @@ int drm_connector_attach_property(struct drm_connector *connector,
                if (connector->property_ids[i] == 0) {
                        connector->property_ids[i] = property->base.id;
                        connector->property_values[i] = init_val;
-                       break;
+                       return;
                }
        }
 
-       if (i == DRM_CONNECTOR_MAX_PROPERTY)
-               return -EINVAL;
-       return 0;
+       WARN(1, "Failed to attach connector property. Please increase "
+               "DRM_CONNECTOR_MAX_PROPERTY by 1 for each time you see this "
+               "message\n");
 }
 EXPORT_SYMBOL(drm_connector_attach_property);