projects/linux·commit 0f0ca143

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

0f0ca143 · Linus Torvalds <[email protected]> · 2014-02-22 08:29:25 -08:00

Pull hwmon fix from Guenter Roeck:
 "Fix writing the minimum temperature in max1668 driver"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (max1668) Fix writing the minimum temperature
Commit
0f0ca14386e0431fbedaae5efc550d46cf93b9cf
Parents
645ceee8 · 500a9157

Merge commit. Changes below are compared with the first parent: 645ceee8.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
drivers/hwmon/max1668.cmodified+1−1View file

drivers/hwmon/max1668.c

View file
diff --git a/drivers/hwmon/max1668.c b/drivers/hwmon/max1668.c
index a762635..029b65e 100644
--- a/drivers/hwmon/max1668.c
+++ b/drivers/hwmon/max1668.c
@@ -243,7 +243,7 @@ static ssize_t set_temp_min(struct device *dev,
data->temp_min[index] = clamp_val(temp/1000, -128, 127);
if (i2c_smbus_write_byte_data(client,
MAX1668_REG_LIML_WR(index),
- data->temp_max[index]))
+ data->temp_min[index]))
count = -EIO;
mutex_unlock(&data->update_lock);