From f354169e0f7dcd1b2c82cf1f98f6d976e85f74c3 Mon Sep 17 00:00:00 2001 From: Anand Moon Date: Mon, 13 Apr 2015 04:14:11 +0930 Subject: [PATCH] hwmon: (pwm-fan) Update the duty cycle inorder to control the pwm-fan pwm_config() must be called with a duty cycle of 0 prior to calling pwm_disable() to ensure that the pwm signal is set to low. Reported-by: Markus Reichl Tested-by: Markus Reichl Reviewed-by: Lukasz Majewski Reviewed-by: Sjoerd Simons Signed-off-by: Anand Moon Signed-off-by: Guenter Roeck --- drivers/hwmon/pwm-fan.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c index 31d793bd7b12..2d9a712699ff 100644 --- a/drivers/hwmon/pwm-fan.c +++ b/drivers/hwmon/pwm-fan.c @@ -47,23 +47,20 @@ static int __set_pwm(struct pwm_fan_ctx *ctx, unsigned long pwm) if (ctx->pwm_value == pwm) goto exit_set_pwm_err; - if (pwm == 0) { - pwm_disable(ctx->pwm); - goto exit_set_pwm; - } - duty = DIV_ROUND_UP(pwm * (ctx->pwm->period - 1), MAX_PWM); ret = pwm_config(ctx->pwm, duty, ctx->pwm->period); if (ret) goto exit_set_pwm_err; + if (pwm == 0) + pwm_disable(ctx->pwm); + if (ctx->pwm_value == 0) { ret = pwm_enable(ctx->pwm); if (ret) goto exit_set_pwm_err; } -exit_set_pwm: ctx->pwm_value = pwm; exit_set_pwm_err: mutex_unlock(&ctx->lock); -- 2.20.1