---

yaml --- r: 298528 b: refs/heads/master c: e02f14c h: refs/heads/master v: v3
git-mirror · Apr 3, 2012 · fd1abc1 · fd1abc1
1 parent 1b8de4a
commit fd1abc1
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: 650dc07ec3b0eba8ff21da706d2b1876ada59fc3
+refs/heads/master: e02f14cd48a5da0ebaecf88c93dbd54a81e0dead
diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c
@@ -1222,8 +1222,10 @@ static int i915_load_gem_init(struct drm_device *dev)
 		i915_gem_do_init(dev, 0, mappable_size, gtt_size);
 
 		ret = i915_gem_init_aliasing_ppgtt(dev);
-		if (ret)
+		if (ret) {
+			mutex_unlock(&dev->struct_mutex);
 			return ret;
+		}
 	} else {
 		/* Let GEM Manage all of the aperture.
 		 *