From 9a428a06e52021c825988449a03f25760767a55b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= <LW@KARO-electronics.de>
Date: Tue, 25 Dec 2012 15:58:39 +0100
Subject: [PATCH] --- yaml --- r: 348728 b: refs/heads/master c:
 efe57d5977fa62b8fdf3a38c236d1aa5351228be h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/staging/imx-drm/imx-drm-core.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a54888aa09a8..3754cbc5ce88 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a8f3f4490922dd62556a8004aa06bc3f1054894
+refs/heads/master: efe57d5977fa62b8fdf3a38c236d1aa5351228be
diff --git a/trunk/drivers/staging/imx-drm/imx-drm-core.c b/trunk/drivers/staging/imx-drm/imx-drm-core.c
index ecf0f44bc70e..cec19f1cf56c 100644
--- a/trunk/drivers/staging/imx-drm/imx-drm-core.c
+++ b/trunk/drivers/staging/imx-drm/imx-drm-core.c
@@ -584,7 +584,6 @@ int imx_drm_add_encoder(struct drm_encoder *encoder,
 
 	ret = imx_drm_encoder_register(imx_drm_encoder);
 	if (ret) {
-		kfree(imx_drm_encoder);
 		ret = -ENOMEM;
 		goto err_register;
 	}