---

yaml --- r: 275903 b: refs/heads/master c: 457eafc h: refs/heads/master i: 275901: 3115a48 275899: d1b29a7 275895: 6f6c8cb 275887: 3497116 275871: 99ee5c1 275839: ef578c2 v: v3
git-mirror · Nov 17, 2011 · d5825f0 · d5825f0
1 parent 390d61b
commit d5825f0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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;
 		}