aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-02-22 08:29:25 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-02-22 08:29:25 -0800
commit0f0ca14386e0431fbedaae5efc550d46cf93b9cf (patch)
treea30a10d61e6a692bf7b61dc0c88f40442e17871d /drivers
parentMerge branch 'xfs-fixes-for-3.14-rc4' of git://oss.sgi.com/xfs/xfs (diff)
parenthwmon: (max1668) Fix writing the minimum temperature (diff)
downloadlinux-dev-0f0ca14386e0431fbedaae5efc550d46cf93b9cf.tar.xz
linux-dev-0f0ca14386e0431fbedaae5efc550d46cf93b9cf.zip
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwmon/max1668.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/max1668.c b/drivers/hwmon/max1668.c
index a7626358c95d..029b65e6c589 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);