Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-13 01:08:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hwmon: (adm1021) Fix cache problem when writing temperature limits

Browse Source 
The module test script for the adm1021 driver exposes a cache problem
when writing temperature limits. temp_min and temp_max are expected
to be stored in milli-degrees C but are stored in degrees C.

Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Cc: stable@vger.kernel.org
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Axel Lin 2014-07-03 22:45:45 +08:00 committed by Guenter Roeck
parent 1035a9e3e9
commit c024044d4d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/hwmon/adm1021.c
View File

@ -185,7 +185,7 @@ static ssize_t set_temp_max(struct device *dev,
struct adm1021_data *data = dev_get_drvdata(dev); struct adm1021_data *data = dev_get_drvdata(dev);
struct i2c_client *client = data->client; struct i2c_client *client = data->client;
long temp; long temp;
int err; int reg_val, err;
err = kstrtol(buf, 10, &temp); err = kstrtol(buf, 10, &temp);
if (err) if (err)
@ -193,10 +193,11 @@ static ssize_t set_temp_max(struct device *dev,
temp /= 1000; temp /= 1000;
mutex_lock(&data->update_lock); mutex_lock(&data->update_lock);
data->temp_max[index] = clamp_val(temp, -128, 127); reg_val = clamp_val(temp, -128, 127);
data->temp_max[index] = reg_val * 1000;
if (!read_only) if (!read_only)
i2c_smbus_write_byte_data(client, ADM1021_REG_TOS_W(index), i2c_smbus_write_byte_data(client, ADM1021_REG_TOS_W(index),
data->temp_max[index]); reg_val);
mutex_unlock(&data->update_lock); mutex_unlock(&data->update_lock);
return count; return count;
@ -210,7 +211,7 @@ static ssize_t set_temp_min(struct device *dev,
struct adm1021_data *data = dev_get_drvdata(dev); struct adm1021_data *data = dev_get_drvdata(dev);
struct i2c_client *client = data->client; struct i2c_client *client = data->client;
long temp; long temp;
int err; int reg_val, err;
err = kstrtol(buf, 10, &temp); err = kstrtol(buf, 10, &temp);
if (err) if (err)
@ -218,10 +219,11 @@ static ssize_t set_temp_min(struct device *dev,
temp /= 1000; temp /= 1000;
mutex_lock(&data->update_lock); mutex_lock(&data->update_lock);
data->temp_min[index] = clamp_val(temp, -128, 127); reg_val = clamp_val(temp, -128, 127);
data->temp_min[index] = reg_val * 1000;
if (!read_only) if (!read_only)
i2c_smbus_write_byte_data(client, ADM1021_REG_THYST_W(index), i2c_smbus_write_byte_data(client, ADM1021_REG_THYST_W(index),
data->temp_min[index]); reg_val);
mutex_unlock(&data->update_lock); mutex_unlock(&data->update_lock);
return count; return count;