From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 11 Feb 2009 14:26:34 +0000 (+0000)
Subject: drm/i915: Unpin the hws if we fail to kmap.
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3eb2ee77b0b6b7b2c10308d7b46d2a459fb5be10;p=linux-2.6-omap-h63xx.git

drm/i915: Unpin the hws if we fail to kmap.

A missing unpin on the error path.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@linux.ie>
---

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index e5fc664337f..fd4b4e268a2 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/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;
 	}