summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-08-09 09:44:11 (GMT)
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-08-09 10:04:53 (GMT)
commit58e73e15708856540056050ae0798c322e43af18 (patch)
treeeafe04e8a1920e4c7d5d76859797e373e357e1d3
parente7457a9a333a95e51dd77515eea326a181f968bc (diff)
downloadlinux-fsl-qoriq-58e73e15708856540056050ae0798c322e43af18.tar.xz
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 <ben@bwidawsk.net> Date: Wed Jul 31 17:00:10 2013 -0700 drm/i915: plumb VM into bind/unbind code Cc: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c2
1 files changed, 1 insertions, 1 deletions
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)