From 42c5a0740e5d5646483118bfdf8aab88ab319dc3 Mon Sep 17 00:00:00 2001
From: Choi, Jong-Hwan <jhbird.choi@samsung.com>
Date: Thu, 7 Jul 2011 09:07:04 +0900
Subject: [PATCH 350/696] gpu: ion: Fix deferencing ERR_PTR

Change-Id: I986c380d75591571890f1a2cba1405e66789b25c
Signed-off-by: Choi, Jong-Hwan <jhbird.choi@samsung.com>
---
 drivers/gpu/ion/ion_heap.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/ion/ion_heap.c b/drivers/gpu/ion/ion_heap.c
index 7c93577..8ce3c19 100644
--- a/drivers/gpu/ion/ion_heap.c
+++ b/drivers/gpu/ion/ion_heap.c
@@ -37,10 +37,13 @@ struct ion_heap *ion_heap_create(struct ion_platform_heap *heap_data)
 		       heap_data->type);
 		return ERR_PTR(-EINVAL);
 	}
-	if (IS_ERR_OR_NULL(heap))
+
+	if (IS_ERR_OR_NULL(heap)) {
 		pr_err("%s: error creating heap %s type %d base %lu size %u\n",
 		       __func__, heap_data->name, heap_data->type,
 		       heap_data->base, heap_data->size);
+		return ERR_PTR(-EINVAL);
+	}
 
 	heap->name = heap_data->name;
 	heap->id = heap_data->id;
-- 
1.7.1


