From ea26a2062d7dc743589e9c597b23c34195694e3b Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sat, 2 Oct 2010 15:59:17 +0200 Subject: [PATCH] --- yaml --- r: 211229 b: refs/heads/master c: 929f49bf225b1b6cd04d0a7b9c0f7377d9131220 h: refs/heads/master i: 211227: 26788a9a46d22878d24c47f96d8fab84131a4d42 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bc1daf853166..03f1e48f1ffa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e39a01501b228e1be2037d5bddccae2a820af902 +refs/heads/master: 929f49bf225b1b6cd04d0a7b9c0f7377d9131220 diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c index bced9b25c71e..cfe597865f5d 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem.c @@ -3258,6 +3258,8 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, (int) reloc->offset, reloc->read_domains, reloc->write_domain); + drm_gem_object_unreference(target_obj); + i915_gem_object_unpin(obj); return -EINVAL; } if (reloc->write_domain & I915_GEM_DOMAIN_CPU ||