drivers/gpu/drm/drm_crtc.c | 6 ------
drivers/gpu/drm/via/via_fb.c | 3 +--
2 files changed, 1 insertion(+), 8 deletions(-)
New commits:
commit eaf83251891b399dc695418979aec07a3aff6f75
Merge: 6266138 422b0ea
Author: James Simmons <jsimm...@infradead.org>
Date: Tue Jan 13 19:45:33 2015 -0700
Merge branch 'drm-next'
commit 422b0ea40c7f78321787858d2193f33e9fa3c224
Merge: af18db4 426959c
Author: James Simmons <jsimm...@infradead.org>
Date: Tue Jan 13 19:45:18 2015 -0700
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux into
drm-next
commit 626613803eb7d73000b22ef150de03c3fb7f0515
Author: James Simmons <jsimm...@infradead.org>
Date: Tue Jan 13 19:38:29 2015 -0700
via: Checkpatch fix - use of kfree is safe, so the checking is
redundant.
Signed-off-by: Mario J. Rugiero <mrugi...@tecnoaccion.com.ar>
Reviewed-by: James Simmons <jsimm...@infradead.org>
diff --git a/drivers/gpu/drm/via/via_fb.c b/drivers/gpu/drm/via/via_fb.c
index 04d1d0d..a105fb4 100644
--- a/drivers/gpu/drm/via/via_fb.c
+++ b/drivers/gpu/drm/via/via_fb.c
@@ -1241,8 +1241,7 @@ via_framebuffer_fini(struct drm_device *dev)
unregister_framebuffer(info);
if (info->cmap.len)
fb_dealloc_cmap(&info->cmap);
- if (info->apertures)
- kfree(info->apertures);
+ kfree(info->apertures);
framebuffer_release(info);
helper->fbdev = NULL;
commit 426959c945538bace94ccc590d8630c02ecd6b0f
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Jan 13 07:38:53 2015 +1000
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.carpen...@oracle.com>
Signed-off-by: Dave Airlie <airl...@redhat.com>
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 7c1786d..caec5c3 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++)
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/openchrome-devel
