Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b53f720c authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ion: msm: Correct OF node refcount handling in error paths"

parents 3f044b1e 03bb3d6d

drivers/staging/android/ion/heaps/ion_carveout_heap.c

+1 −0
Original line number Diff line number Diff line
@@ -405,6 +405,7 @@ ion_secure_carveout_heap_create(struct ion_platform_heap *heap_data) 
	return &manager->heap.ion_heap;



err:

	of_node_put(np);

	ion_secure_carveout_heap_destroy(&manager->heap.ion_heap);

	return ERR_PTR(-EINVAL);

}

drivers/staging/android/ion/heaps/ion_system_heap.c

+3 −3
Original line number Diff line number Diff line
@@ -506,9 +506,8 @@ static struct ion_heap_ops system_heap_ops = { 
	.shrink = ion_system_heap_shrink,

};



static __maybe_unused int ion_system_heap_debug_show(struct ion_heap *heap,

						     struct seq_file *s,

						     void *unused)

static int ion_system_heap_debug_show(struct ion_heap *heap,

				      struct seq_file *s, void *unused)

{

	struct ion_system_heap *sys_heap;

	bool use_seq = s;
@@ -711,6 +710,7 @@ struct ion_heap *ion_system_heap_create(struct ion_platform_heap *data) 
	if (!heap)

		return ERR_PTR(-ENOMEM);

	heap->heap.dev = data->priv;

	heap->heap.debug_show = ion_system_heap_debug_show;

	heap->heap.ion_heap.ops = &system_heap_ops;

	heap->heap.ion_heap.buf_ops = msm_ion_dma_buf_ops;

	heap->heap.ion_heap.type = ION_HEAP_TYPE_SYSTEM;

drivers/staging/android/ion/heaps/msm_ion.c

+1 −0
Original line number Diff line number Diff line
@@ -430,6 +430,7 @@ static struct ion_platform_data *msm_ion_parse_dt(struct platform_device *pdev) 
	return pdata;



free_heaps:

	of_node_put(node);

	release_reserved_memory_regions(pdata->heaps, idx);

	free_pdata(pdata);

	return ERR_PTR(ret);