From: Ville Syrjälä Date: Tue, 6 Mar 2018 16:48:45 +0000 (+0200) Subject: drm: WARN when trying add enum values to non-enum/bitmask properties X-Git-Tag: v4.17-rc1~185^2~16^2~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1371f2604dad70942041a7f1ed1a2029c67606b1;p=thirdparty%2Fkernel%2Flinux.git drm: WARN when trying add enum values to non-enum/bitmask properties Trying to add enum values to non-enum/bitmask properties is a programmer mistake. WARN to make sure the developers notice their mistake. Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20180306164849.2862-2-ville.syrjala@linux.intel.com Reviewed-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/drm_property.c b/drivers/gpu/drm/drm_property.c index d77b0c4dc4857..e676b1ecc705f 100644 --- a/drivers/gpu/drm/drm_property.c +++ b/drivers/gpu/drm/drm_property.c @@ -378,8 +378,8 @@ int drm_property_add_enum(struct drm_property *property, int index, if (WARN_ON(strlen(name) >= DRM_PROP_NAME_LEN)) return -EINVAL; - if (!(drm_property_type_is(property, DRM_MODE_PROP_ENUM) || - drm_property_type_is(property, DRM_MODE_PROP_BITMASK))) + if (WARN_ON(!drm_property_type_is(property, DRM_MODE_PROP_ENUM) && + !drm_property_type_is(property, DRM_MODE_PROP_BITMASK))) return -EINVAL; /*