git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
radeon
/
radeon_display.c
diff --git
a/drivers/gpu/drm/radeon/radeon_display.c
b/drivers/gpu/drm/radeon/radeon_display.c
index
7422f27
..
b92d2f2
100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_display.c
+++ b/
drivers/gpu/drm/radeon/radeon_display.c
@@
-843,8
+843,9
@@
static void radeon_user_framebuffer_destroy(struct drm_framebuffer *fb)
{
struct radeon_framebuffer *radeon_fb = to_radeon_framebuffer(fb);
{
struct radeon_framebuffer *radeon_fb = to_radeon_framebuffer(fb);
- if (radeon_fb->obj)
+ if (radeon_fb->obj)
{
drm_gem_object_unreference_unlocked(radeon_fb->obj);
drm_gem_object_unreference_unlocked(radeon_fb->obj);
+ }
drm_framebuffer_cleanup(fb);
kfree(radeon_fb);
}
drm_framebuffer_cleanup(fb);
kfree(radeon_fb);
}