Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/omapdrm/omap_crtc.c

+1 −2
Original line number Diff line number Diff line
@@ -320,8 +320,7 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev, 


fail:

	if (crtc) {

		drm_crtc_cleanup(crtc);

		kfree(omap_crtc);

		omap_crtc_destroy(crtc);

	}

	return NULL;

}

drivers/staging/omapdrm/omap_encoder.c

+1 −2
Original line number Diff line number Diff line
@@ -164,8 +164,7 @@ struct drm_encoder *omap_encoder_init(struct drm_device *dev, 


fail:

	if (encoder) {

		drm_encoder_cleanup(encoder);

		kfree(omap_encoder);

		omap_encoder_destroy(encoder);

	}



	return NULL;

drivers/staging/omapdrm/omap_fb.c

+2 −4
Original line number Diff line number Diff line
@@ -53,11 +53,9 @@ static void omap_framebuffer_destroy(struct drm_framebuffer *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->paddr && omap_gem_put_paddr(omap_fb->bo))

			dev_err(dev->dev, "could not unmap!\n");

		drm_gem_object_unreference_unlocked(omap_fb->bo);

	}