projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
adc3184
)
drm: fix mismerge in drm_crtc.c
author
Dave Airlie
<
[email protected]
>
Mon, 12 Jan 2015 21:38:53 +0000
(07:38 +1000)
committer
Dave Airlie
<
[email protected]
>
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 <
[email protected]
>
Signed-off-by: Dave Airlie <
[email protected]
>
drivers/gpu/drm/drm_crtc.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/drm_crtc.c
b/drivers/gpu/drm/drm_crtc.c
index 7c1786df6213b0816ec444780c1947b52329f3a8..caec5c3634bbfa981b4a2223184ba59a2da305a6 100644
(file)
--- 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++)