Skip to content

Commit

Permalink
drm: fix mismerge in drm_crtc.c
Browse files Browse the repository at this point in the history
Daniel merged two things in 72a3697,
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>
  • Loading branch information
Dave Airlie committed Jan 12, 2015
1 parent adc3184 commit 426959c
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions drivers/gpu/drm/drm_crtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++)
Expand Down

0 comments on commit 426959c

Please sign in to comment.