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

Commit b63d97a3 authored by Chris D Schimp's avatar Chris D Schimp Committed by Guenter Roeck
Browse files

hwmon: (max6639) Fix FAN_FROM_REG calculation 



RPM calculation from tachometer value does not depend on PPR.
Also, do not report negative RPM values.

Signed-off-by: default avatarChris D Schimp <silverchris@gmail.com>
[guenter.roeck@ericsson.com: do not report negative RPM values]
Signed-off-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
Cc: stable@vger.kernel.org # 3.0+
Acked-by: default avatarRoland Stigge <stigge@antcom.de>
parent b01543df

drivers/hwmon/max6639.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -72,8 +72,8 @@ static unsigned short normal_i2c[] = { 0x2c, 0x2e, 0x2f, I2C_CLIENT_END }; 




static const int rpm_ranges[] = { 2000, 4000, 8000, 16000 };

static const int rpm_ranges[] = { 2000, 4000, 8000, 16000 };





#define FAN_FROM_REG(val, div, rpm_range)	((val) == 0 ? -1 : \

#define FAN_FROM_REG(val, rpm_range)	((val) == 0 || (val) == 255 ? \

	(val) == 255 ? 0 : (rpm_ranges[rpm_range] * 30) / ((div + 1) * (val)))

				0 : (rpm_ranges[rpm_range] * 30) / (val))

#define TEMP_LIMIT_TO_REG(val)	SENSORS_LIMIT((val) / 1000, 0, 255)

#define TEMP_LIMIT_TO_REG(val)	SENSORS_LIMIT((val) / 1000, 0, 255)





/*

/*
@@ -333,7 +333,7 @@ static ssize_t show_fan_input(struct device *dev, 
		return PTR_ERR(data);

		return PTR_ERR(data);





	return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[attr->index],

	return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[attr->index],

		       data->ppr, data->rpm_range));

		       data->rpm_range));

}

}





static ssize_t show_alarm(struct device *dev,

static ssize_t show_alarm(struct device *dev,