summaryrefslogtreecommitdiff
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorStefan Wahren <stefan.wahren@i2se.com>2019-04-03 15:48:33 +0300
committerGuenter Roeck <linux@roeck-us.net>2019-04-16 03:19:23 +0300
commit53f1647da3e8fb3e89066798f0fdc045064d353d (patch)
tree62285a995d270583d039e90846832f455014bfcf /drivers/hwmon
parent15ade5d2e7775667cf191cf2f94327a4889f8b9d (diff)
downloadlinux-53f1647da3e8fb3e89066798f0fdc045064d353d.tar.xz
hwmon: (pwm-fan) Disable PWM if fetching cooling data fails
In case pwm_fan_of_get_cooling_data() fails we should disable the PWM just like in the other error cases. Fixes: 2e5219c77183 ("hwmon: (pwm-fan) Read PWM FAN configuration from device tree") Cc: <stable@vger.kernel.org> # 4.14+ Reported-by: Guenter Rock <linux@roeck-us.net> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/pwm-fan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c
index 167221c7628a..e4c5197417a8 100644
--- a/drivers/hwmon/pwm-fan.c
+++ b/drivers/hwmon/pwm-fan.c
@@ -271,7 +271,7 @@ static int pwm_fan_probe(struct platform_device *pdev)
ret = pwm_fan_of_get_cooling_data(&pdev->dev, ctx);
if (ret)
- return ret;
+ goto err_pwm_disable;
ctx->pwm_fan_state = ctx->pwm_fan_max_state;
if (IS_ENABLED(CONFIG_THERMAL)) {