From: Damien Lespiau <damien.lespiau@intel.com>
Date: Fri, 30 Aug 2013 14:39:26 +0000 (+0100)
Subject: drm/i915: Don't call sg_free_table() if sg_alloc_table() fails
X-Git-Tag: v3.12-rc2~3^2~2^2~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d2933a5b8f8f11cbdf9d2e44f0c7c7abeeb64e6b;p=platform%2Fkernel%2Flinux-exynos.git

drm/i915: Don't call sg_free_table() if sg_alloc_table() fails

One needs to call __sg_free_table() if __sg_alloc_table() fails, but
sg_alloc_table() does that for us already.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewd-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 6131305..f21a0c3 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1774,7 +1774,6 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
 
 	page_count = obj->base.size / PAGE_SIZE;
 	if (sg_alloc_table(st, page_count, GFP_KERNEL)) {
-		sg_free_table(st);
 		kfree(st);
 		return -ENOMEM;
 	}