diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2019-06-07 22:27:06 +0200 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2019-06-24 03:32:34 +0200 |
| commit | 5696e4aaabf2a6bae0fe8b4abf17fe17c2b03beb (patch) | |
| tree | f28c240ade7c7c6bc59aa862d670684c93080988 | |
| parent | hwmon: (gpio-fan) Check return value from devm_add_action_or_reset (diff) | |
| download | linux-5696e4aaabf2a6bae0fe8b4abf17fe17c2b03beb.tar.xz linux-5696e4aaabf2a6bae0fe8b4abf17fe17c2b03beb.zip | |
hwmon: (pwm-fan) Check return value from devm_add_action_or_reset
devm_add_action_or_reset() can fail due to a memory allocation failure.
Check for it and return the error if that happens.
Fixes: 37bcec5d9f71 ("hwmon: (pwm-fan) Use devm_thermal_of_cooling_device_register")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| -rw-r--r-- | drivers/hwmon/pwm-fan.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c index 08c9b9f1c16e..54c0ff00d67f 100644 --- a/drivers/hwmon/pwm-fan.c +++ b/drivers/hwmon/pwm-fan.c @@ -320,8 +320,10 @@ static int pwm_fan_probe(struct platform_device *pdev) dev_err(dev, "Failed to enable fan supply: %d\n", ret); return ret; } - devm_add_action_or_reset(dev, pwm_fan_regulator_disable, - ctx->reg_en); + ret = devm_add_action_or_reset(dev, pwm_fan_regulator_disable, + ctx->reg_en); + if (ret) + return ret; } ctx->pwm_value = MAX_PWM; @@ -337,7 +339,9 @@ static int pwm_fan_probe(struct platform_device *pdev) return ret; } timer_setup(&ctx->rpm_timer, sample_timer, 0); - devm_add_action_or_reset(dev, pwm_fan_pwm_disable, ctx); + ret = devm_add_action_or_reset(dev, pwm_fan_pwm_disable, ctx); + if (ret) + return ret; of_property_read_u32(dev->of_node, "pulses-per-revolution", &ppr); ctx->pulses_per_revolution = ppr; |