From 5cb239754543b36b7c29402ce7875a4bc7344f00 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Tue, 23 Oct 2007 14:02:24 +0200 Subject: [PATCH] --- yaml --- r: 84510 b: refs/heads/master c: 72240307e988627df46553846936aa89a0f6a283 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/gl518sm.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 823a588ec8af..3c71776c0bf9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21df67b191fd612fa28aedd39ec1414d8effc454 +refs/heads/master: 72240307e988627df46553846936aa89a0f6a283 diff --git a/trunk/drivers/hwmon/gl518sm.c b/trunk/drivers/hwmon/gl518sm.c index c5255118bc16..3b1ac48fce23 100644 --- a/trunk/drivers/hwmon/gl518sm.c +++ b/trunk/drivers/hwmon/gl518sm.c @@ -96,10 +96,10 @@ static inline u8 FAN_TO_REG(long rpm, int div) long rpmdiv; if (rpm == 0) return 0; - rpmdiv = SENSORS_LIMIT(rpm, 1, 1920000) * div; - return SENSORS_LIMIT((960000 + rpmdiv / 2) / rpmdiv, 1, 255); + rpmdiv = SENSORS_LIMIT(rpm, 1, 960000) * div; + return SENSORS_LIMIT((480000 + rpmdiv / 2) / rpmdiv, 1, 255); } -#define FAN_FROM_REG(val,div) ((val)==0 ? 0 : (960000/((val)*(div)))) +#define FAN_FROM_REG(val,div) ((val)==0 ? 0 : (480000/((val)*(div)))) #define IN_TO_REG(val) (SENSORS_LIMIT((((val)+9)/19),0,255)) #define IN_FROM_REG(val) ((val)*19)