]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
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)
committerGuenter Roeck <linux@roeck-us.net>
Tue, 16 Apr 2019 00:19:23 +0000 (17:19 -0700)
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>
drivers/hwmon/pwm-fan.c

index 167221c7628a529626d8961e42f3cff373f8f72f..e4c5197417a87d7c798eb6af7169b40824708378 100644 (file)
@@ -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)) {