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