From 8746b0a6cd3726d3a8d9bff6f77563543b2b1317 Mon Sep 17 00:00:00 2001
From: Rob Clark <rob@ti.com>
Date: Fri, 9 Dec 2011 23:26:07 -0600
Subject: [PATCH] --- yaml --- r: 281349 b: refs/heads/master c:
 65b0bd067df97737b9a13d92934d8f581cb0b07a h: refs/heads/master i:   281347:
 7d8615a90f180e6ae1f18f273925256885ccb7cc v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/staging/omapdrm/omap_crtc.c    | 3 +--
 trunk/drivers/staging/omapdrm/omap_encoder.c | 3 +--
 trunk/drivers/staging/omapdrm/omap_fb.c      | 6 ++----
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index bd26fa2c2a10..6bb5bf8b011c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b369839b88d6ffd9ad5b4f9362d6bb09a0e16c10
+refs/heads/master: 65b0bd067df97737b9a13d92934d8f581cb0b07a
diff --git a/trunk/drivers/staging/omapdrm/omap_crtc.c b/trunk/drivers/staging/omapdrm/omap_crtc.c
index fd09bcfab858..cffdf5e12394 100644
--- a/trunk/drivers/staging/omapdrm/omap_crtc.c
+++ b/trunk/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/trunk/drivers/staging/omapdrm/omap_encoder.c b/trunk/drivers/staging/omapdrm/omap_encoder.c
index 83bacd8fd362..06c52cb62d2f 100644
--- a/trunk/drivers/staging/omapdrm/omap_encoder.c
+++ b/trunk/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/trunk/drivers/staging/omapdrm/omap_fb.c b/trunk/drivers/staging/omapdrm/omap_fb.c
index 491be5395d85..3f62505813c2 100644
--- a/trunk/drivers/staging/omapdrm/omap_fb.c
+++ b/trunk/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);
 	}