Преглед на файлове

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 <dan.carpenter@oracle.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie преди 10 години
родител
ревизия
426959c945
променени са 1 файла, в които са добавени 0 реда и са изтрити 6 реда
  1. 0 6
      drivers/gpu/drm/drm_crtc.c

+ 0 - 6
drivers/gpu/drm/drm_crtc.c

@@ -4369,12 +4369,6 @@ bool drm_property_change_valid_get(struct drm_property *property,
 		} else {
 		} else {
 			return _object_find(property->dev, value, property->values[0]) != NULL;
 			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++)
 	for (i = 0; i < property->num_values; i++)