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

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

Merge "msm: thermal: Update cluster info only if sync cluster DT is defined"

parents 3b4821ed 22538e39

drivers/thermal/msm_thermal.c

+7 −2
Original line number Diff line number Diff line
@@ -746,6 +746,13 @@ static void update_cpu_topology(struct device *dev) 
	core_ptr->entity_count = cluster_cnt;

	core_ptr->cluster_id = -1;

	core_ptr->sync_cluster = false;



	sync_cluster_id = get_sync_cluster(dev, &sync_cluster_cnt);

	if (!sync_cluster_id) {

		devm_kfree(dev, core_ptr);

		core_ptr = NULL;

		return;

	}

	temp_ptr = devm_kzalloc(dev, sizeof(struct cluster_info) * cluster_cnt,

					GFP_KERNEL);

	if (!temp_ptr) {
@@ -755,8 +762,6 @@ static void update_cpu_topology(struct device *dev) 
		return;

	}



	sync_cluster_id = get_sync_cluster(dev, &sync_cluster_cnt);



	for (i = 0; i < cluster_cnt; i++) {

		pr_debug("Cluster_ID:%d CPU's:%lu\n", cluster_id[i],

				*cluster_cpus[i].bits);