aboutsummaryrefslogtreecommitdiffstats
path: root/i2c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-11-28 10:10:41 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2005-11-28 10:10:41 -0800
commited087c4bc638c8606bc06a35154016e3fa07752f (patch)
treefdcb135f9694620b980f8035f28d549dc76b5928 /i2c
parentd97856649e5cfcbb402b85bc09b39f3972236407 (diff)
downloadpatches-ed087c4bc638c8606bc06a35154016e3fa07752f.tar.gz
removed patches added to 2.6.15-rc2-git4
Diffstat (limited to 'i2c')
-rw-r--r--i2c/hwmon-fix-missing-it87-fan-div-init.patch41
-rw-r--r--i2c/hwmon-hdaps-missing-an-axis.patch32
-rw-r--r--i2c/hwmon-lm78-fix-vid.patch31
-rw-r--r--i2c/hwmon-w83627hf-missing-in0-limit-check.patch44
4 files changed, 0 insertions, 148 deletions
diff --git a/i2c/hwmon-fix-missing-it87-fan-div-init.patch b/i2c/hwmon-fix-missing-it87-fan-div-init.patch
deleted file mode 100644
index f9ba85678c192..0000000000000
--- a/i2c/hwmon-fix-missing-it87-fan-div-init.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From khali@linux-fr.org Mon Nov 21 10:05:47 2005
-Date: Mon, 21 Nov 2005 19:22:16 +0100
-From: Jean Delvare <khali@linux-fr.org>
-To: Greg KH <greg@kroah.com>
-Cc: Nicolas Mailhot <nicolas.mailhot@laposte.net>
-Subject: hwmon: Fix missing it87 fan div init
-Message-Id: <20051121192216.3a72d4c4.khali@linux-fr.org>
-
-Fix a bug where setting the low fan speed limits will not work if no
-data was ever read through the sysfs interface and the fan clock
-dividers have not been explicitely set yet either. The reason is that
-data->fan_div[nr] may currently be used before it is initialized from
-the chip register values. The fix is to explicitely initialize
-data->fan_div[nr] before using it.
-
-Bug reported, and fix tested, by Nicolas Mailhot.
-
-Signed-off-by: Jean Delvare <khali@linux-fr.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
----
- drivers/hwmon/it87.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- gregkh-2.6.orig/drivers/hwmon/it87.c
-+++ gregkh-2.6/drivers/hwmon/it87.c
-@@ -522,8 +522,15 @@ static ssize_t set_fan_min(struct device
- struct i2c_client *client = to_i2c_client(dev);
- struct it87_data *data = i2c_get_clientdata(client);
- int val = simple_strtol(buf, NULL, 10);
-+ u8 reg = it87_read_value(client, IT87_REG_FAN_DIV);
-
- down(&data->update_lock);
-+ switch (nr) {
-+ case 0: data->fan_div[nr] = reg & 0x07; break;
-+ case 1: data->fan_div[nr] = (reg >> 3) & 0x07; break;
-+ case 2: data->fan_div[nr] = (reg & 0x40) ? 3 : 1; break;
-+ }
-+
- data->fan_min[nr] = FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr]));
- it87_write_value(client, IT87_REG_FAN_MIN(nr), data->fan_min[nr]);
- up(&data->update_lock);
diff --git a/i2c/hwmon-hdaps-missing-an-axis.patch b/i2c/hwmon-hdaps-missing-an-axis.patch
deleted file mode 100644
index 200fa2bca3bcb..0000000000000
--- a/i2c/hwmon-hdaps-missing-an-axis.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From khali@linux-fr.org Tue Nov 22 14:14:25 2005
-Date: Tue, 22 Nov 2005 23:12:41 +0100
-From: Jean Delvare <khali@linux-fr.org>
-To: Greg KH <greg@kroah.com>
-Cc: Robert Love <rml@novell.com>
-Subject: hwmon: hdaps missing an axis
-Message-Id: <20051122231241.62b51406.khali@linux-fr.org>
-Content-Disposition: inline; filename=hwmon-hdaps-missing-an-axis.patch
-
-From: Eugeniy Meshcheryakov <eugen@univ.kiev.ua>
-
-Trivial patch to report both hdaps axises to the joystick device, not
-just the X axis.
-
-Signed-off-by: Robert Love <rml@novell.com>
-Signed-off-by: Jean Delvare <khali@linux-fr.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
----
- drivers/hwmon/hdaps.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- gregkh-2.6.orig/drivers/hwmon/hdaps.c
-+++ gregkh-2.6/drivers/hwmon/hdaps.c
-@@ -570,7 +570,7 @@ static int __init hdaps_init(void)
- hdaps_idev->evbit[0] = BIT(EV_ABS);
- input_set_abs_params(hdaps_idev, ABS_X,
- -256, 256, HDAPS_INPUT_FUZZ, HDAPS_INPUT_FLAT);
-- input_set_abs_params(hdaps_idev, ABS_X,
-+ input_set_abs_params(hdaps_idev, ABS_Y,
- -256, 256, HDAPS_INPUT_FUZZ, HDAPS_INPUT_FLAT);
-
- input_register_device(hdaps_idev);
diff --git a/i2c/hwmon-lm78-fix-vid.patch b/i2c/hwmon-lm78-fix-vid.patch
deleted file mode 100644
index 38c48750ba1aa..0000000000000
--- a/i2c/hwmon-lm78-fix-vid.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From khali@linux-fr.org Mon Nov 14 14:00:46 2005
-Date: Mon, 14 Nov 2005 23:11:45 +0100
-From: Jean Delvare <khali@linux-fr.org>
-To: Greg KH <greg@kroah.com>
-Subject: hwmon: Fix lm78 VID conversion
-Message-Id: <20051114231145.670478d0.khali@linux-fr.org>
-Content-Disposition: inline; filename=hwmon-lm78-fix-vid.patch
-
-Fix the lm78 VID reading, which I accidentally broke while making
-this driver use the common vid_from_reg function rather than
-reimplementing its own in 2.6.14-rc1.
-
-I'm not proud of it, trust me.
-
-Signed-off-by: Jean Delvare <khali@linux-fr.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
----
- drivers/hwmon/lm78.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- gregkh-2.6.orig/drivers/hwmon/lm78.c
-+++ gregkh-2.6/drivers/hwmon/lm78.c
-@@ -451,7 +451,7 @@ static DEVICE_ATTR(fan3_div, S_IRUGO, sh
- static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)
- {
- struct lm78_data *data = lm78_update_device(dev);
-- return sprintf(buf, "%d\n", vid_from_reg(82, data->vid));
-+ return sprintf(buf, "%d\n", vid_from_reg(data->vid, 82));
- }
- static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
-
diff --git a/i2c/hwmon-w83627hf-missing-in0-limit-check.patch b/i2c/hwmon-w83627hf-missing-in0-limit-check.patch
deleted file mode 100644
index e486dd51f8ac4..0000000000000
--- a/i2c/hwmon-w83627hf-missing-in0-limit-check.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From khali@linux-fr.org Mon Nov 14 13:55:35 2005
-Date: Mon, 14 Nov 2005 23:08:38 +0100
-From: Jean Delvare <khali@linux-fr.org>
-To: Greg KH <greg@kroah.com>
-Cc: Yuan Mu <Ymu@winbond.com.tw>
-Subject: [PATCH] hwmon: Fix missing boundary check when setting W83627THF in0 limits
-Message-Id: <20051114230838.37a9f2d8.khali@linux-fr.org>
-Content-Disposition: inline; filename=hwmon-w83627hf-missing-in0-limit-check.patch
-
-From: Yuan Mu <Ymu@winbond.com.tw>
-
-Add SENSORS_LIMIT in store VCore limit functions. This fixes a potential
-u8 overflow on out-of-range user input.
-
-Signed-off-by: Jean Delvare <khali@linux-fr.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
----
- drivers/hwmon/w83627hf.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
---- gregkh-2.6.orig/drivers/hwmon/w83627hf.c
-+++ gregkh-2.6/drivers/hwmon/w83627hf.c
-@@ -456,7 +456,9 @@ static ssize_t store_regs_in_min0(struct
- (w83627thf == data->type || w83637hf == data->type))
-
- /* use VRM9 calculation */
-- data->in_min[0] = (u8)(((val * 100) - 70000 + 244) / 488);
-+ data->in_min[0] =
-+ SENSORS_LIMIT(((val * 100) - 70000 + 244) / 488, 0,
-+ 255);
- else
- /* use VRM8 (standard) calculation */
- data->in_min[0] = IN_TO_REG(val);
-@@ -481,7 +483,9 @@ static ssize_t store_regs_in_max0(struct
- (w83627thf == data->type || w83637hf == data->type))
-
- /* use VRM9 calculation */
-- data->in_max[0] = (u8)(((val * 100) - 70000 + 244) / 488);
-+ data->in_max[0] =
-+ SENSORS_LIMIT(((val * 100) - 70000 + 244) / 488, 0,
-+ 255);
- else
- /* use VRM8 (standard) calculation */
- data->in_max[0] = IN_TO_REG(val);