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

Commit 60e53dd1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "staging: ion: msm: Only parse available dt nodes"

parents 85b3499b 9042e5df

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

+2 −2
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ static struct ion_platform_data *msm_ion_parse_dt(struct platform_device *pdev) 
	uint32_t num_heaps = 0;

	int idx = 0;



	for_each_child_of_node(dt_node, node)

	for_each_available_child_of_node(dt_node, node)

		num_heaps++;



	if (!num_heaps)
@@ -598,7 +598,7 @@ static struct ion_platform_data *msm_ion_parse_dt(struct platform_device *pdev) 
	pdata->heaps = heaps;

	pdata->nr = num_heaps;



	for_each_child_of_node(dt_node, node) {

	for_each_available_child_of_node(dt_node, node) {

		new_dev = of_platform_device_create(node, NULL, &pdev->dev);

		if (!new_dev) {

			pr_err("Failed to create device %s\n", node->name);