2019-04-03 12:50:47

by Stefan Wahren

Subject: [PATCH] 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.

Reported-by: Guenter Rock <[email protected]>
Signed-off-by: Stefan Wahren <[email protected]>
Fixes: 2e5219c77183 ("hwmon: (pwm-fan) Read PWM FAN configuration from device tree")
Cc: <[email protected]> # 4.14
---
drivers/hwmon/pwm-fan.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c
index 167221c..e4c5197 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)) {
--
2.7.4

2019-04-03 13:20:48

by Guenter Roeck

Subject: Re: [PATCH] hwmon: pwm-fan: Disable PWM if fetching cooling data fails

On Wed, Apr 03, 2019 at 02:48:33PM +0200, Stefan Wahren wrote:
> In case pwm_fan_of_get_cooling_data() fails we should disable the PWM
> just like in the other error cases.
>
> Reported-by: Guenter Rock <[email protected]>
> Signed-off-by: Stefan Wahren <[email protected]>
> Fixes: 2e5219c77183 ("hwmon: (pwm-fan) Read PWM FAN configuration from device tree")
> Cc: <[email protected]> # 4.14

Applied.

Thanks,
Guenter

> ---
> drivers/hwmon/pwm-fan.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c
> index 167221c..e4c5197 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)) {