From 426959c945538bace94ccc590d8630c02ecd6b0f Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 13 Jan 2015 07:38:53 +1000 Subject: [PATCH] drm: fix mismerge in drm_crtc.c Daniel merged two things in 72a3697097b8dc92f5b8362598f5730a9986eb83, but he merged this code twice, Dan's static checker spotted it. Reported-by: Dan Carpenter Signed-off-by: Dave Airlie --- drivers/gpu/drm/drm_crtc.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 7c1786df6213..caec5c3634bb 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -4369,12 +4369,6 @@ bool drm_property_change_valid_get(struct drm_property *property, } else { return _object_find(property->dev, value, property->values[0]) != NULL; } - } else { - int i; - for (i = 0; i < property->num_values; i++) - if (property->values[i] == value) - return true; - return false; } for (i = 0; i < property->num_values; i++) -- 2.34.1