Merge "cpuidle: lpm-levels: Fix NULL pointer exception at lpm_get_latency" (6d44a116) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/cpuidle/lpm-levels.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -239,6 +239,11 @@ int lpm_get_latency(struct latency_level level, uint32_t latency)
		struct lpm_cluster *cluster;
		uint32_t val;

		if (!lpm_root_node) {
		pr_err("%s: lpm_probe not completed\n", __func__);
		return -EAGAIN;
		}

		if ((level->affinity_level < 0)
		\|\| (level->affinity_level > lpm_root_node->aff_level)
		\|\| (level->reset_level < LPM_RESET_LVL_RET)
		@@ -246,11 +251,6 @@ int lpm_get_latency(struct latency_level level, uint32_t latency)
		\|\| !latency)
		return -EINVAL;

		if (!lpm_root_node) {
		pr_err("%s: lpm_probe not completed\n", __func__);
		return -EAGAIN;
		}

		cluster = cluster_aff_match(lpm_root_node, level->affinity_level);
		if (!cluster) {
		pr_err("%s:No matching cluster found for affinity_level:%d\n",