From: Dan Carpenter Date: Fri, 9 Aug 2013 09:44:11 +0000 (+0300) Subject: drm/i915: unbreak i915_gem_object_ggtt_unbind() X-Git-Tag: upstream/snapshot3+hdmi~4265^2~73^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=58e73e15708856540056050ae0798c322e43af18;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git drm/i915: unbreak i915_gem_object_ggtt_unbind() There is an extra semi-colon here so we just leak and never unbind anything. This regression has been introduced in commit 07fe0b12800d4752d729d4122c01f41f80a5ba5a Author: Ben Widawsky Date: Wed Jul 31 17:00:10 2013 -0700 drm/i915: plumb VM into bind/unbind code Cc: Ben Widawsky Signed-off-by: Dan Carpenter Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index f5d389a..79cef3c 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2664,7 +2664,7 @@ i915_gem_object_ggtt_unbind(struct drm_i915_gem_object *obj) struct drm_i915_private *dev_priv = obj->base.dev->dev_private; struct i915_address_space *ggtt = &dev_priv->gtt.base; - if (!i915_gem_obj_ggtt_bound(obj)); + if (!i915_gem_obj_ggtt_bound(obj)) return 0; if (obj->pin_count)