Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae51cd9b authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare
Browse files

hwmon: (w83795) Fix fan control mode attributes 



There were two bugs:
* Speed cruise mode was improperly reported for all fans but fan1.
* Fan control method (PWM vs. DC) was mixed with the control mode.
  It will be added back as a separate attribute, as per the standard
  sysfs interface.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
parent 61ec2da5

drivers/hwmon/w83795.c

+8 −10
Original line number Diff line number Diff line
@@ -857,19 +857,19 @@ show_pwm_enable(struct device *dev, struct device_attribute *attr, char *buf) 
	int index = sensor_attr->index;

	u8 tmp;



	if (1 == (data->pwm_fcms[0] & (1 << index))) {

	/* Speed cruise mode */

	if (data->pwm_fcms[0] & (1 << index)) {

		tmp = 2;

		goto out;

	}

	/* Thermal cruise or SmartFan IV mode */

	for (tmp = 0; tmp < 6; tmp++) {

		if (data->pwm_tfmr[tmp] & (1 << index)) {

			tmp = 3;

			goto out;

		}

	}

	if (data->pwm_fomc & (1 << index))

		tmp = 0;

	else

	/* Manual mode */

	tmp = 1;



out:
@@ -890,23 +890,21 @@ store_pwm_enable(struct device *dev, struct device_attribute *attr, 


	if (strict_strtoul(buf, 10, &val) < 0)

		return -EINVAL;

	if (val > 2)

	if (val < 1 || val > 2)

		return -EINVAL;



	mutex_lock(&data->update_lock);

	switch (val) {

	case 0:

	case 1:

		/* Clear speed cruise mode bits */

		data->pwm_fcms[0] &= ~(1 << index);

		w83795_write(client, W83795_REG_FCMS1, data->pwm_fcms[0]);

		/* Clear thermal cruise mode bits */

		for (i = 0; i < 6; i++) {

			data->pwm_tfmr[i] &= ~(1 << index);

			w83795_write(client, W83795_REG_TFMR(i),

				data->pwm_tfmr[i]);

		}

		data->pwm_fomc |= 1 << index;

		data->pwm_fomc ^= val << index;

		w83795_write(client, W83795_REG_FOMC, data->pwm_fomc);

		break;

	case 2:

		data->pwm_fcms[0] |= (1 << index);