[ 03/73] hwmon: (max6639) Fix FAN_FROM_REG calculation
From: Greg KH <gregkh@linuxfoundation.org>
Date: 2012-02-28 01:38:34
Also in:
lkml
3.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chris D Schimp <redacted> commit b63d97a36edb1aecf8c13e5f5783feff4d64c24b upstream. RPM calculation from tachometer value does not depend on PPR. Also, do not report negative RPM values. Signed-off-by: Chris D Schimp <redacted> [guenter.roeck@ericsson.com: do not report negative RPM values] Signed-off-by: Guenter Roeck <redacted> Acked-by: Roland Stigge <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/hwmon/max6639.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
--- a/drivers/hwmon/max6639.c
+++ b/drivers/hwmon/max6639.c@@ -72,8 +72,8 @@ static unsigned short normal_i2c[] = { 0 static const int rpm_ranges[] = { 2000, 4000, 8000, 16000 }; -#define FAN_FROM_REG(val, div, rpm_range) ((val) == 0 ? -1 : \ - (val) == 255 ? 0 : (rpm_ranges[rpm_range] * 30) / ((div + 1) * (val))) +#define FAN_FROM_REG(val, rpm_range) ((val) == 0 || (val) == 255 ? \ + 0 : (rpm_ranges[rpm_range] * 30) / (val)) #define TEMP_LIMIT_TO_REG(val) SENSORS_LIMIT((val) / 1000, 0, 255) /*
@@ -333,7 +333,7 @@ static ssize_t show_fan_input(struct dev return PTR_ERR(data); 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,