From a722006fd0411263079e56c9b02ca155809aa790 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Wed, 6 Jan 2010 17:39:31 +0100
Subject: [PATCH] --- yaml --- r: 178867 b: refs/heads/master c:
 5eb226132f53d5ec36ce4e7ff9d6b49cceb50f3d h: refs/heads/master i:   178865:
 ede2e15b222a4142c17ca0fee9572ab00fad11d5   178863:
 d52acc3f123479b7f78f1050dcb59a9a617eb6ab v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/gpu/drm/radeon/radeon_cp.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2c58e2f51714..d48133b0599b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d3d51b6d2d6fb51c6c30a8c7ed0fd939f6100bf
+refs/heads/master: 5eb226132f53d5ec36ce4e7ff9d6b49cceb50f3d
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_cp.c b/trunk/drivers/gpu/drm/radeon/radeon_cp.c
index 0b2f9c2ad2c1..06123ba31d31 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_cp.c
@@ -2145,6 +2145,7 @@ int radeon_master_create(struct drm_device *dev, struct drm_master *master)
 			 &master_priv->sarea);
 	if (ret) {
 		DRM_ERROR("SAREA setup failed\n");
+		kfree(master_priv);
 		return ret;
 	}
 	master_priv->sarea_priv = master_priv->sarea->handle + sizeof(struct drm_sarea);