From d5825f04bec008f736d538fd3be00648fefa76ba Mon Sep 17 00:00:00 2001
From: Rakib Mullick <rakib.mullick@gmail.com>
Date: Wed, 16 Nov 2011 00:49:28 +0600
Subject: [PATCH] --- yaml --- r: 275903 b: refs/heads/master c:
 457eafce618cf89125da9d79751d81241bd3fa34 h: refs/heads/master i:   275901:
 3115a48842ce4f62b7e9cbd6d01b7b0f6ab58a3e   275899:
 d1b29a76ccdf94c95dd12afa0b224b10c8b9814a   275895:
 6f6c8cbaabcadb7a2f0ff10cc30b24e75bf707a3   275887:
 349711628f03168e8455dc33bc61486f973ec9ed   275871:
 99ee5c132e1527d9c6869c955754e194db77d1bd   275839:
 ef578c2a1584f30760f5317fe0929cc857447c12 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_gem.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 40f59bfca46c..9593675ce5b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a10f401a401ca69c6537641c8fc0d6b57b5aee8
+refs/heads/master: 457eafce618cf89125da9d79751d81241bd3fa34
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index ed0b68fdb970..8359dc777041 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -3512,9 +3512,11 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
 			 * so emit a request to do so.
 			 */
 			request = kzalloc(sizeof(*request), GFP_KERNEL);
-			if (request)
+			if (request) {
 				ret = i915_add_request(obj->ring, NULL, request);
-			else
+				if (ret)
+					kfree(request);
+			} else
 				ret = -ENOMEM;
 		}