hwmon: (pwm-fan) Disable PWM if fetching cooling data fails
authorStefan Wahren <stefan.wahren@i2se.com>
Wed, 3 Apr 2019 12:48:33 +0000 (14:48 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 16 May 2019 17:42:19 +0000 (19:42 +0200)
commit 53f1647da3e8fb3e89066798f0fdc045064d353d upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/hwmon/pwm-fan.c

index ca250e7ac511a5891857d35dccd070ed271f7135..6d30bec04f2d851e24ba93a49d14fd8945212263 100644 (file)
@@ -250,7 +250,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)) {