diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2014-12-21 22:49:12 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2014-12-21 22:49:12 +0800 |
| commit | 32c9edc4e356063e0218362d452a269cfa6798ee (patch) | |
| tree | 43982a1f642c7fedef1cc5f8c247b646582cbe03 /drivers/thermal/thermal_core.c | |
| parent | 59c56eb6db0c14fe569b1c9625cb850e52d29d88 (diff) | |
| parent | 503ccc3fec4a56cdcfedc507cd1ea0d85e1fbfa2 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc
Diffstat (limited to 'drivers/thermal/thermal_core.c')
| -rw-r--r-- | drivers/thermal/thermal_core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 84fdf0792e27..87e0b0782023 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -930,7 +930,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; @@ -947,7 +947,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; |