hwmon: (pwm-fan) Explicitly switch off fan power when setting pwm1_enable to 0
authorMatthias Schiffer <matthias.schiffer@ew.tq-group.com>
Thu, 13 Oct 2022 13:59:51 +0000 (15:59 +0200)
committerGuenter Roeck <linux@roeck-us.net>
Sun, 16 Oct 2022 22:52:59 +0000 (15:52 -0700)
When pwm1_enable is changed from 1 to 0 while pwm1 == 0, the regulator
is not switched off as expected. The reason is that when the fan is
already off, ctx->enabled is false, so pwm_fan_power_off() will be a
no-op.

Handle this case explicitly in pwm_fan_update_enable() by calling
pwm_fan_switch_power() directly.

Fixes: b99152d4f04b ("hwmon: (pwm-fan) Switch regulator dynamically")
Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Link: https://lore.kernel.org/r/20221013135951.4902-1-matthias.schiffer@ew.tq-group.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/pwm-fan.c

index dc3d9a22d9176438f29c3299450025ee16d685c3..83a347ca35da5c5299f351a5e70165600a5d8405 100644 (file)
@@ -257,7 +257,10 @@ static int pwm_fan_update_enable(struct pwm_fan_ctx *ctx, long val)
 
        if (val == 0) {
                /* Disable pwm-fan unconditionally */
-               ret = __set_pwm(ctx, 0);
+               if (ctx->enabled)
+                       ret = __set_pwm(ctx, 0);
+               else
+                       ret = pwm_fan_switch_power(ctx, false);
                if (ret)
                        ctx->enable_mode = old_val;
                pwm_fan_update_state(ctx, 0);