---

yaml --- r: 131146 b: refs/heads/master c: 7d8d58b h: refs/heads/master v: v3
git-mirror · Feb 8, 2009 · 190586b · 190586b
1 parent be6b4f6
commit 190586b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 122ee2a63bc49d21f402f6b6d2208306cdcc98c1
+refs/heads/master: 7d8d58b23fd01e60ed44d8d8c10b2df86e638faa
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -588,8 +588,10 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 	if (obj_priv->fence_reg == I915_FENCE_REG_NONE &&
 	    obj_priv->tiling_mode != I915_TILING_NONE) {
 		ret = i915_gem_object_get_fence_reg(obj, write);
-		if (ret != 0)
+		if (ret) {
+			mutex_unlock(&dev->struct_mutex);
 			return VM_FAULT_SIGBUS;
+		}
 	}
 
 	pfn = ((dev->agp->base + obj_priv->gtt_offset) >> PAGE_SHIFT) +