---

yaml --- r: 131620 b: refs/heads/master c: 3eb2ee7 h: refs/heads/master v: v3
git-mirror · Feb 20, 2009 · 001e3d4 · 001e3d4
1 parent 7d4d196
commit 001e3d4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47ed185a777632063d2748f59d14ec6fdeb26f67
+refs/heads/master: 3eb2ee77b0b6b7b2c10308d7b46d2a459fb5be10
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -3106,6 +3106,7 @@ i915_gem_init_hws(struct drm_device *dev)
 	if (dev_priv->hw_status_page == NULL) {
 		DRM_ERROR("Failed to map status page.\n");
 		memset(&dev_priv->hws_map, 0, sizeof(dev_priv->hws_map));
+		i915_gem_object_unpin(obj);
 		drm_gem_object_unreference(obj);
 		return -EINVAL;
 	}