hwmon: (f75375s) Fix register write order when setting fans to full speed (c1c1a3d0) · Commits · 戴 / test

By hwmon sysfs interface convention, setting pwm_enable to zero sets a fan to full speed. In the f75375s driver, this need be done by enabling manual fan control, plus duty mode for the F875387 chip, and then setting the maximum duty cycle. Fix a bug where the two necessary register writes were swapped, effectively discarding the setting to full-speed. Signed-off-by:

Nikolaus Schulz <mail@microschulz.de> Cc: Riku Voipio <riku.voipio@iki.fi> Signed-off-by:

Guenter Roeck <guenter.roeck@ericsson.com>

drivers/hwmon/f75375s.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -340,8 +340,6 @@ static int set_pwm_enable_direct(struct i2c_client *client, int nr, int val)
		fanmode \|= (1 << F75387_FAN_MANU_MODE(nr));
		fanmode \|= (1 << F75387_FAN_DUTY_MODE(nr));
		data->pwm[nr] = 255;
		f75375_write8(client, F75375_REG_FAN_PWM_DUTY(nr),
		data->pwm[nr]);
		break;
		case 1: /* PWM */
		fanmode \|= (1 << F75387_FAN_MANU_MODE(nr));
		@@ -361,8 +359,6 @@ static int set_pwm_enable_direct(struct i2c_client *client, int nr, int val)
		case 0: /* full speed */
		fanmode \|= (3 << FAN_CTRL_MODE(nr));
		data->pwm[nr] = 255;
		f75375_write8(client, F75375_REG_FAN_PWM_DUTY(nr),
		data->pwm[nr]);
		break;
		case 1: /* PWM */
		fanmode \|= (3 << FAN_CTRL_MODE(nr));
		@@ -377,6 +373,9 @@ static int set_pwm_enable_direct(struct i2c_client *client, int nr, int val)

		f75375_write8(client, F75375_REG_FAN_TIMER, fanmode);
		data->pwm_enable[nr] = val;
		if (val == 0)
		f75375_write8(client, F75375_REG_FAN_PWM_DUTY(nr),
		data->pwm[nr]);
		return 0;
		}

Admin message