UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: 37bcec5d9f ("hwmon: (pwm-fan) Use devm_thermal_of_cooling_device_register")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Guenter Roeck 2019-06-07 13:27:06 -07:00
parent b9bb92e1d1
commit 5696e4aaab
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/hwmon/pwm-fan.c
View File

@ -320,8 +320,10 @@ static int pwm_fan_probe(struct platform_device *pdev)
dev_err(dev, "Failed to enable fan supply: %d\n", ret); dev_err(dev, "Failed to enable fan supply: %d\n", ret);
return ret; return ret;
} }
devm_add_action_or_reset(dev, pwm_fan_regulator_disable, ret = devm_add_action_or_reset(dev, pwm_fan_regulator_disable,
ctx->reg_en); ctx->reg_en);
if (ret)
return ret;
} }
ctx->pwm_value = MAX_PWM; ctx->pwm_value = MAX_PWM;
@ -337,7 +339,9 @@ static int pwm_fan_probe(struct platform_device *pdev)
return ret; return ret;
} }
timer_setup(&ctx->rpm_timer, sample_timer, 0); 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); of_property_read_u32(dev->of_node, "pulses-per-revolution", &ppr);
ctx->pulses_per_revolution = ppr; ctx->pulses_per_revolution = ppr;