projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
hwmon
/
adm1021.c
diff --git
a/drivers/hwmon/adm1021.c
b/drivers/hwmon/adm1021.c
index f920619cd6da5405ca5cd9c64e9f1ad31fb8a526..27ad7fb0657215769fc1074f391ca083f9493fa0 100644
(file)
--- a/
drivers/hwmon/adm1021.c
+++ b/
drivers/hwmon/adm1021.c
@@
-185,7
+185,7
@@
static ssize_t set_temp_max(struct device *dev,
struct i2c_client *client = to_i2c_client(dev);
struct adm1021_data *data = i2c_get_clientdata(client);
long temp;
struct i2c_client *client = to_i2c_client(dev);
struct adm1021_data *data = i2c_get_clientdata(client);
long temp;
- int err;
+ int
reg_val,
err;
err = kstrtol(buf, 10, &temp);
if (err)
err = kstrtol(buf, 10, &temp);
if (err)
@@
-193,10
+193,11
@@
static ssize_t set_temp_max(struct device *dev,
temp /= 1000;
mutex_lock(&data->update_lock);
temp /= 1000;
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)
i2c_smbus_write_byte_data(client, ADM1021_REG_TOS_W(index),
if (!read_only)
i2c_smbus_write_byte_data(client, ADM1021_REG_TOS_W(index),
-
data->temp_max[index]
);
+
reg_val
);
mutex_unlock(&data->update_lock);
return count;
mutex_unlock(&data->update_lock);
return count;
@@
-210,7
+211,7
@@
static ssize_t set_temp_min(struct device *dev,
struct i2c_client *client = to_i2c_client(dev);
struct adm1021_data *data = i2c_get_clientdata(client);
long temp;
struct i2c_client *client = to_i2c_client(dev);
struct adm1021_data *data = i2c_get_clientdata(client);
long temp;
- int err;
+ int
reg_val,
err;
err = kstrtol(buf, 10, &temp);
if (err)
err = kstrtol(buf, 10, &temp);
if (err)
@@
-218,10
+219,11
@@
static ssize_t set_temp_min(struct device *dev,
temp /= 1000;
mutex_lock(&data->update_lock);
temp /= 1000;
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)
i2c_smbus_write_byte_data(client, ADM1021_REG_THYST_W(index),
if (!read_only)
i2c_smbus_write_byte_data(client, ADM1021_REG_THYST_W(index),
-
data->temp_min[index]
);
+
reg_val
);
mutex_unlock(&data->update_lock);
return count;
mutex_unlock(&data->update_lock);
return count;