mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 16:49:22 +00:00
thermal:core:fix: Check return code of the ->get_max_state() callback
The return code from ->get_max_state() callback was not checked during binding cooling device to thermal zone device. Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
parent
73904cbc1a
commit
9a3031dc3e
1 changed files with 4 additions and 2 deletions
|
@ -928,7 +928,7 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
|
||||||
struct thermal_zone_device *pos1;
|
struct thermal_zone_device *pos1;
|
||||||
struct thermal_cooling_device *pos2;
|
struct thermal_cooling_device *pos2;
|
||||||
unsigned long max_state;
|
unsigned long max_state;
|
||||||
int result;
|
int result, ret;
|
||||||
|
|
||||||
if (trip >= tz->trips || (trip < 0 && trip != THERMAL_TRIPS_NONE))
|
if (trip >= tz->trips || (trip < 0 && trip != THERMAL_TRIPS_NONE))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
@ -945,7 +945,9 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
|
||||||
if (tz != pos1 || cdev != pos2)
|
if (tz != pos1 || cdev != pos2)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
cdev->ops->get_max_state(cdev, &max_state);
|
ret = cdev->ops->get_max_state(cdev, &max_state);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
/* lower default 0, upper default max_state */
|
/* lower default 0, upper default max_state */
|
||||||
lower = lower == THERMAL_NO_LIMIT ? 0 : lower;
|
lower = lower == THERMAL_NO_LIMIT ? 0 : lower;
|
||||||
|
|
Loading…
Reference in a new issue