On 20/02/12 22:59, Chris wrote:
> Patch to fix FAN_FROM_REG calculations
> Signed-off-by: Chris D Schimp <silverchris <at> gmail.com>
Thanks for your work!
Acked-by: Roland Stigge <stigge@xxxxxxxxx>
> ---
>
> diff -uprN -X a/Documentation/dontdiff a/drivers/hwmon/max6639.c
> b/drivers/hwmon/max6639.c
> --- a/drivers/hwmon/max6639.c 2012-02-06 12:47:00.000000000 -0500
> +++ b/drivers/hwmon/max6639.c 2012-02-20 16:36:02.553668023 -0500
> @@ -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 ? -1 : \
> + (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,
_______________________________________________
lm-sensors mailing list
lm-sensors@xxxxxxxxxxxxxx
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
