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

Commit 9a3031dc authored by Lukasz Majewski's avatar Lukasz Majewski Committed by Eduardo Valentin
Browse files

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: default avatarLukasz Majewski <l.majewski@samsung.com>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent 73904cbc

drivers/thermal/thermal_core.c

+4 −2
Original line number Diff line number Diff line
@@ -928,7 +928,7 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, 
	struct thermal_zone_device *pos1;

	struct thermal_cooling_device *pos2;

	unsigned long max_state;

	int result;

	int result, ret;



	if (trip >= tz->trips || (trip < 0 && trip != THERMAL_TRIPS_NONE))

		return -EINVAL;
@@ -945,7 +945,9 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, 
	if (tz != pos1 || cdev != pos2)

		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 = lower == THERMAL_NO_LIMIT ? 0 : lower;