From: Greg Kroah-Hartman Date: Fri, 13 Mar 2009 22:13:57 +0000 (-0700) Subject: .28 patch X-Git-Tag: v2.6.28.8~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a915459da9cfab6c58b82a255c3d796fab4070bb;p=thirdparty%2Fkernel%2Fstable-queue.git .28 patch --- diff --git a/queue-2.6.28/hwmon-properly-decode-128-degrees-c-temperature.patch b/queue-2.6.28/hwmon-properly-decode-128-degrees-c-temperature.patch new file mode 100644 index 00000000000..84629910722 --- /dev/null +++ b/queue-2.6.28/hwmon-properly-decode-128-degrees-c-temperature.patch @@ -0,0 +1,45 @@ +From khali@linux-fr.org Fri Mar 13 15:11:51 2009 +From: Jean Delvare +Date: Fri, 13 Mar 2009 13:34:04 +0100 +Subject: hwmon: (it87) Properly decode -128 degrees C temperature +To: stable@kernel.org +Message-ID: <20090313133404.79642fc4@hyperion.delvare> + +commit e267d25005c861fe6afda343f044536342c9f8b4 upstream + +The it87 driver is reporting -128 degrees C as +128 degrees C. +That's not a terribly likely temperature value but let's still +get it right, especially when it simplifies the code. + +Signed-off-by: Jean Delvare +Signed-off-by: Greg Kroah-Hartman + + +--- + drivers/hwmon/it87.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/hwmon/it87.c ++++ b/drivers/hwmon/it87.c +@@ -207,7 +207,7 @@ static inline u16 FAN16_TO_REG(long rpm) + + #define TEMP_TO_REG(val) (SENSORS_LIMIT(((val)<0?(((val)-500)/1000):\ + ((val)+500)/1000),-128,127)) +-#define TEMP_FROM_REG(val) (((val)>0x80?(val)-0x100:(val))*1000) ++#define TEMP_FROM_REG(val) ((val) * 1000) + + #define PWM_TO_REG(val) ((val) >> 1) + #define PWM_FROM_REG(val) (((val)&0x7f) << 1) +@@ -261,9 +261,9 @@ struct it87_data { + u8 has_fan; /* Bitfield, fans enabled */ + u16 fan[5]; /* Register values, possibly combined */ + u16 fan_min[5]; /* Register values, possibly combined */ +- u8 temp[3]; /* Register value */ +- u8 temp_high[3]; /* Register value */ +- u8 temp_low[3]; /* Register value */ ++ s8 temp[3]; /* Register value */ ++ s8 temp_high[3]; /* Register value */ ++ s8 temp_low[3]; /* Register value */ + u8 sensor; /* Register value */ + u8 fan_div[3]; /* Register encoding, shifted right */ + u8 vid; /* Register encoding, combined */ diff --git a/queue-2.6.28/series b/queue-2.6.28/series index 837dc446536..094d1d215c6 100644 --- a/queue-2.6.28/series +++ b/queue-2.6.28/series @@ -110,3 +110,4 @@ crypto-api-fix-algorithm-test-race-that-broke-aead-initialisation.patch hwmon-hide-misleading-error-message.patch drm-i915-add-missing-userland-definitions-for-gem-init-execbuffer.patch mips-compat-implement-is_compat_task.patch +hwmon-properly-decode-128-degrees-c-temperature.patch