2 files changed, 10 insertions, 8 deletions

diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
index 6ceac4f2d4b2..5b4b47ed948b 100644
--- a/drivers/thermal/cpu_cooling.c
+++ b/drivers/thermal/cpu_cooling.c
@@ -857,14 +857,6 @@ __cpufreq_cooling_register(struct device_node *np,
                 goto free_power_table;
         }
 
-        snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d",
-                 cpufreq_dev->id);
-
-        cool_dev = thermal_of_cooling_device_register(np, dev_name, cpufreq_dev,
-                                                      &cpufreq_cooling_ops);
-        if (IS_ERR(cool_dev))
-                goto remove_idr;
-
         /* Fill freq-table in descending order of frequencies */
         for (i = 0, freq = -1; i <= cpufreq_dev->max_level; i++) {
                 freq = find_next_max(table, freq);
@@ -877,6 +869,14 @@ __cpufreq_cooling_register(struct device_node *np,
                         pr_debug("%s: freq:%u KHz\n", __func__, freq);
         }
 
+        snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d",
+                 cpufreq_dev->id);
+
+        cool_dev = thermal_of_cooling_device_register(np, dev_name, cpufreq_dev,
+                                                      &cpufreq_cooling_ops);
+        if (IS_ERR(cool_dev))
+                goto remove_idr;
+
         cpufreq_dev->clipped_freq = cpufreq_dev->freq_table[0];
         cpufreq_dev->cool_dev = cool_dev;
 
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index e45abe7db9a6..ee517bef0db0 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -335,6 +335,8 @@ struct thermal_genl_event {
  * @get_trend: a pointer to a function that reads the sensor temperature trend.
  * @set_emul_temp: a pointer to a function that sets sensor emulated
  *                 temperature.
+ * @set_trip_temp: a pointer to a function that sets the trip temperature on
+ *                 hardware.
  */
 struct thermal_zone_of_device_ops {
         int (*get_temp)(void *, int *);