diff --git a/drivers/gpu/ion/ion_heap.c b/drivers/gpu/ion/ion_heap.c
index 7c93577c9b3c..8ce3c1907bad 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;