Commit 81886722 authored by Lukasz Luba's avatar Lukasz Luba Committed by Rafael J. Wysocki
Browse files

PM: EM: Check if the get_cost() callback is present in em_compute_costs() 



Subsequent changes will introduce a case in which 'cb->get_cost' may
not be set in em_compute_costs(), so add a check to ensure that it is
not NULL before attempting to dereference it.

Reviewed-by: default avatarDietmar Eggemann <dietmar.eggemann@arm.com>
Tested-by: default avatarDietmar Eggemann <dietmar.eggemann@arm.com>
Signed-off-by: default avatarLukasz Luba <lukasz.luba@arm.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent faf7075b

kernel/power/energy_model.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static int em_compute_costs(struct device *dev, struct em_perf_state *table, 
	for (i = nr_states - 1; i >= 0; i--) {

		unsigned long power_res, cost;



		if (flags & EM_PERF_DOMAIN_ARTIFICIAL) {

		if ((flags & EM_PERF_DOMAIN_ARTIFICIAL) && cb->get_cost) {

			ret = cb->get_cost(dev, table[i].frequency, &cost);

			if (ret || !cost || cost > EM_MAX_POWER) {

				dev_err(dev, "EM: invalid cost %lu %d\n",