hwmon patches added

diff --git a/review-2.6.25/hwmon-fix-function-range_to_reg.patch b/review-2.6.25/hwmon-fix-function-range_to_reg.patch
new file mode 100644 (file)
index 0000000..b604d07
--- /dev/null
+++ b/review-2.6.25/hwmon-fix-function-range_to_reg.patch
@@ -0,0 +1,40 @@
+From khali@linux-fr.org  Mon Jun 23 15:05:56 2008
+From: Jean Delvare <khali@linux-fr.org>
+Date: Mon, 23 Jun 2008 10:14:26 +0200
+Subject: hwmon: (lm85) Fix function RANGE_TO_REG()
+To: stable@kernel.org
+Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
+Message-ID: <20080623101426.31de961b@hyperion.delvare>
+
+From: Jean Delvare <khali@linux-fr.org>
+
+Function RANGE_TO_REG() is broken. For a requested range of 2000 (2
+degrees C), it will return an index value of 15, i.e. 80.0 degrees C,
+instead of the expected index value of 0. All other values are handled
+properly, just 2000 isn't.
+
+The bug was introduced back in November 2004 by this patch:
+http://git.kernel.org/?p=linux/kernel/git/tglx/history.git;a=commit;h=1c28d80f1992240373099d863e4996cdd5d646d0
+
+In Linus' kernel I decided to rewrite the whole function in a way
+which was more obviously correct. But for -stable let's just do the
+minimal fix.
+
+Signed-off-by: Jean Delvare <khali@linux-fr.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/hwmon/lm85.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/hwmon/lm85.c
++++ b/drivers/hwmon/lm85.c
+@@ -192,7 +192,7 @@ static int RANGE_TO_REG( int range )
+ {
+       int i;
+ 
+-      if ( range < lm85_range_map[0] ) { 
++      if (range <= lm85_range_map[0]) {
+               return 0 ;
+       } else if ( range > lm85_range_map[15] ) {
+               return 15 ;

diff --git a/review-2.6.25/patch-hwmon-initialize-max_duty_at_overheat-before-use.patch b/review-2.6.25/patch-hwmon-initialize-max_duty_at_overheat-before-use.patch
new file mode 100644 (file)
index 0000000..cf51269
--- /dev/null
+++ b/review-2.6.25/patch-hwmon-initialize-max_duty_at_overheat-before-use.patch
@@ -0,0 +1,38 @@
+From khali@linux-fr.org  Mon Jun 23 15:06:46 2008
+From: Jean Delvare <khali@linux-fr.org>
+Date: Mon, 23 Jun 2008 10:22:10 +0200
+Subject: hwmon: (adt7473) Initialize max_duty_at_overheat before use
+To: stable@kernel.org
+Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>, "Darrick J. Wong" <djwong@us.ibm.com>
+Message-ID: <20080623102210.6a7f63d7@hyperion.delvare>
+
+From: Jean Delvare <khali@linux-fr.org>
+
+commit ed4ec814e45ae8b1596aea0a29b92f6c3614acaa upstream
+
+data->max_duty_at_overheat is not updated in adt7473_update_device,
+so it might be used before it is initialized (if the user reads from
+sysfs file max_duty_at_crit before writing to it.)
+
+Signed-off-by: Jean Delvare <khali@linux-fr.org>
+Acked-by: Darrick J. Wong <djwong@us.ibm.com>
+Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
+---
+ drivers/hwmon/adt7473.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/hwmon/adt7473.c
++++ b/drivers/hwmon/adt7473.c
+@@ -309,6 +309,9 @@ no_sensor_update:
+                                               ADT7473_REG_PWM_BHVR(i));
+       }
+ 
++      i = i2c_smbus_read_byte_data(client, ADT7473_REG_CFG4);
++      data->max_duty_at_overheat = !!(i & ADT7473_CFG4_MAX_DUTY_AT_OVT);
++
+       data->limits_last_updated = local_jiffies;
+       data->limits_valid = 1;
+ 

diff --git a/review-2.6.25/series b/review-2.6.25/series
index 46ccf1e74da1446ab1cd20d89edbfd920b48935b..5af6371618322560330cabb7850e190d7f7e197c 100644 (file)
--- a/review-2.6.25/series
+++ b/review-2.6.25/series
@@ -5,3 +5,5 @@ x86-use-bootmem_exclusive-on-32-bit.patch
 x86-set-pae-physical_mask_shift-to-44-bits.patch
 add-return-value-to-reserve_bootmem_node.patch
 watchdog-hpwdt-fix-use-of-inline-assembly.patch
+hwmon-fix-function-range_to_reg.patch
+patch-hwmon-initialize-max_duty_at_overheat-before-use.patch