Commit 65b0bd06 authored by Rob Clark's avatar Rob Clark Committed by Greg Kroah-Hartman

staging: drm/omap: crtc/encoder/fb destroy cleanups

Signed-off-by: default avatarRob Clark <rob@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b369839b
...@@ -320,8 +320,7 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev, ...@@ -320,8 +320,7 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,
fail: fail:
if (crtc) { if (crtc) {
drm_crtc_cleanup(crtc); omap_crtc_destroy(crtc);
kfree(omap_crtc);
} }
return NULL; return NULL;
} }
...@@ -164,8 +164,7 @@ struct drm_encoder *omap_encoder_init(struct drm_device *dev, ...@@ -164,8 +164,7 @@ struct drm_encoder *omap_encoder_init(struct drm_device *dev,
fail: fail:
if (encoder) { if (encoder) {
drm_encoder_cleanup(encoder); omap_encoder_destroy(encoder);
kfree(omap_encoder);
} }
return NULL; return NULL;
......
...@@ -53,11 +53,9 @@ static void omap_framebuffer_destroy(struct drm_framebuffer *fb) ...@@ -53,11 +53,9 @@ static void omap_framebuffer_destroy(struct drm_framebuffer *fb)
drm_framebuffer_cleanup(fb); drm_framebuffer_cleanup(fb);
if (omap_gem_put_paddr(omap_fb->bo)) {
dev_err(dev->dev, "could not unmap!\n");
}
if (omap_fb->bo) { if (omap_fb->bo) {
if (omap_fb->paddr && omap_gem_put_paddr(omap_fb->bo))
dev_err(dev->dev, "could not unmap!\n");
drm_gem_object_unreference_unlocked(omap_fb->bo); drm_gem_object_unreference_unlocked(omap_fb->bo);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment