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

Commit aa0c38cf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal 

Pull thermal SoC management fixes from Eduardo Valentin:
 "Minor fixes on of-thermal and cpu cooling"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
  thermal: cpu_cooling: Clarify error message
  thermal: of-thermal: Print name of device node with error
parents fb7453e6 bf78f133

drivers/thermal/cpu_cooling.c

+1 −1
Original line number Diff line number Diff line
@@ -774,7 +774,7 @@ of_cpufreq_cooling_register(struct cpufreq_policy *policy) 


		cdev = __cpufreq_cooling_register(np, policy, capacitance);

		if (IS_ERR(cdev)) {

			pr_err("cpu_cooling: cpu%d is not running as cooling device: %ld\n",

			pr_err("cpu_cooling: cpu%d failed to register as cooling device: %ld\n",

			       policy->cpu, PTR_ERR(cdev));

			cdev = NULL;

		}

drivers/thermal/of-thermal.c

+2 −2
Original line number Diff line number Diff line
@@ -867,14 +867,14 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) 


	ret = of_property_read_u32(np, "polling-delay-passive", &prop);

	if (ret < 0) {

		pr_err("missing polling-delay-passive property\n");

		pr_err("%pOFn: missing polling-delay-passive property\n", np);

		goto free_tz;

	}

	tz->passive_delay = prop;



	ret = of_property_read_u32(np, "polling-delay", &prop);

	if (ret < 0) {

		pr_err("missing polling-delay property\n");

		pr_err("%pOFn: missing polling-delay property\n", np);

		goto free_tz;

	}

	tz->polling_delay = prop;