diff --git a/[refs] b/[refs] index 4732885e2bd7..a8b13609373d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7188b3ddecdfe106b9b75292d95166cf074deed +refs/heads/master: 62c00421b31424489435619545a53802eab07f3e diff --git a/trunk/drivers/thermal/cpu_cooling.c b/trunk/drivers/thermal/cpu_cooling.c index eb62ffaad6a2..329653caba21 100644 --- a/trunk/drivers/thermal/cpu_cooling.c +++ b/trunk/drivers/thermal/cpu_cooling.c @@ -336,6 +336,11 @@ static int cpufreq_thermal_notifier(struct notifier_block *nb, * cpufreq_get_max_state - callback function to get the max cooling state. * @cdev: thermal cooling device pointer. * @state: fill this variable with the max cooling state. + * + * Callback for the thermal cooling device to return the cpufreq + * max cooling state. + * + * Return: 0 on success, an error code otherwise. */ static int cpufreq_get_max_state(struct thermal_cooling_device *cdev, unsigned long *state)