| Message ID | 1554295713-18656-1-git-send-email-stefan.wahren@i2se.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | hwmon: pwm-fan: Disable PWM if fetching cooling data fails | expand |
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)) {
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)) {
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(-)