drm: fix mismerge in drm_crtc.c
authorDave Airlie <airlied@redhat.com>
Mon, 12 Jan 2015 21:38:53 +0000 (07:38 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 12 Jan 2015 21:38:53 +0000 (07:38 +1000)
Daniel merged two things in 72a3697097b8dc92f5b8362598f5730a9986eb83,
but he merged this code twice, Dan's static checker spotted it.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/drm_crtc.c

index 7c1786df6213b0816ec444780c1947b52329f3a8..caec5c3634bbfa981b4a2223184ba59a2da305a6 100644 (file)
@@ -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++)