diff --git a/drivers/staging/omapdrm/omap_crtc.c b/drivers/staging/omapdrm/omap_crtc.c
index fd09bcfab858e0b0f0de662538db9d25a6ebd746..cffdf5e1239424331edb51f45528139255263626 100644
--- a/drivers/staging/omapdrm/omap_crtc.c
+++ b/drivers/staging/omapdrm/omap_crtc.c
@@ -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;
 }
diff --git a/drivers/staging/omapdrm/omap_encoder.c b/drivers/staging/omapdrm/omap_encoder.c
index 83bacd8fd3629466d553f04b273baea5b64aa8e2..06c52cb62d2f0e78666b13b02ba8c300031d3088 100644
--- a/drivers/staging/omapdrm/omap_encoder.c
+++ b/drivers/staging/omapdrm/omap_encoder.c
@@ -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;
diff --git a/drivers/staging/omapdrm/omap_fb.c b/drivers/staging/omapdrm/omap_fb.c
index 491be5395d851d6f9ec04feedebc3f3626581afc..3f62505813c23ff740282aad147bc97a57a0dcf0 100644
--- a/drivers/staging/omapdrm/omap_fb.c
+++ b/drivers/staging/omapdrm/omap_fb.c
@@ -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);
 	}