summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/armada/armada_fbdev.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-10-27 19:35:27 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-12-11 00:25:12 +0400
commit077acbab67a785b5f5ae60e8932fcf6028072359 (patch)
treefaa62a8e30e168ad2be63467d0977e32b2d5a9c8 /drivers/gpu/drm/armada/armada_fbdev.c
parent2f5ae4901acc6fdee939718658fa9f59c4f2217b (diff)
downloadlinux-077acbab67a785b5f5ae60e8932fcf6028072359.tar.xz
DRM: Armada: destroy framebuffer after helper
Destroy the framebuffer only after the helper, since the helper may still be referencing the framebufer at this point. Reviewed-by: Rob Clark <robdclark@gmail.com> Reviewed-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/gpu/drm/armada/armada_fbdev.c')
-rw-r--r--drivers/gpu/drm/armada/armada_fbdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/armada/armada_fbdev.c b/drivers/gpu/drm/armada/armada_fbdev.c
index 743570e99f90..b348b16f81e2 100644
--- a/drivers/gpu/drm/armada/armada_fbdev.c
+++ b/drivers/gpu/drm/armada/armada_fbdev.c
@@ -202,11 +202,11 @@ void armada_fbdev_fini(struct drm_device *dev)
framebuffer_release(info);
}
+ drm_fb_helper_fini(fbh);
+
if (fbh->fb)
fbh->fb->funcs->destroy(fbh->fb);
- drm_fb_helper_fini(fbh);
-
priv->fbdev = NULL;
}
}