---

yaml --- r: 165995 b: refs/heads/master c: 7e61615 h: refs/heads/master i: 165993: b90c2cf 165991: bdfed9c v: v3
git-mirror · Sep 11, 2009 · 178f115 · 178f115
1 parent a551c02
commit 178f115
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e517a5e97080bbe52857bd0d7df9b66602d53c4d
+refs/heads/master: 7e61615857c6fb3afbcb43f5c4e97511a923f5a8
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -3834,7 +3834,8 @@ void i915_gem_free_object(struct drm_gem_object *obj)
 
 	i915_gem_object_unbind(obj);
 
-	i915_gem_free_mmap_offset(obj);
+	if (obj_priv->mmap_offset)
+		i915_gem_free_mmap_offset(obj);
 
 	kfree(obj_priv->page_cpu_valid);
 	kfree(obj_priv->bit_17);