devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] hwmon: pwm-fan: Disable PWM if fetching cooling data fails
@ 2019-04-03 12:48 Stefan Wahren
  2019-04-03 13:18 ` Guenter Roeck
  0 siblings, 1 reply; 2+ messages in thread
From: Stefan Wahren @ 2019-04-03 12:48 UTC (permalink / raw)
  To: Kamil Debski, Bartlomiej Zolnierkiewicz, Jean Delvare,
	Guenter Roeck, Rob Herring, Mark Rutland, Robin Murphy
  Cc: Lukasz Majewski, linux-hwmon, devicetree, linux-kernel,
	Stefan Wahren, # 4 . 14

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 <linux@roeck-us.net>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Fixes: 2e5219c77183 ("hwmon: (pwm-fan) Read PWM FAN configuration from device tree")
Cc: <stable@vger.kernel.org> # 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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] hwmon: pwm-fan: Disable PWM if fetching cooling data fails
  2019-04-03 12:48 [PATCH] hwmon: pwm-fan: Disable PWM if fetching cooling data fails Stefan Wahren
@ 2019-04-03 13:18 ` Guenter Roeck
  0 siblings, 0 replies; 2+ messages in thread
From: Guenter Roeck @ 2019-04-03 13:18 UTC (permalink / raw)
  To: Stefan Wahren
  Cc: Kamil Debski, Bartlomiej Zolnierkiewicz, Jean Delvare,
	Rob Herring, Mark Rutland, Robin Murphy, Lukasz Majewski,
	linux-hwmon, devicetree, linux-kernel, # 4 . 14

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 <linux@roeck-us.net>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
> Fixes: 2e5219c77183 ("hwmon: (pwm-fan) Read PWM FAN configuration from device tree")
> Cc: <stable@vger.kernel.org> # 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)) {

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-04-03 13:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-03 12:48 [PATCH] hwmon: pwm-fan: Disable PWM if fetching cooling data fails Stefan Wahren
2019-04-03 13:18 ` Guenter Roeck

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).