summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-09-04 09:43:54 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-09-04 09:43:54 -0700
commit06ee709517902b42797bd759bd0406e2273d7b51 (patch)
treebd47453870843752bf5af121df2c93f26e407c5b
parent0e03f98c4601f208b356326f30cffcc9d9191e27 (diff)
parent39c627a084475e8a690a4a9e7601410ca173ddd2 (diff)
downloadlwn-06ee709517902b42797bd759bd0406e2273d7b51.tar.gz
lwn-06ee709517902b42797bd759bd0406e2273d7b51.zip
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon bugfix from Guenter Roeck: "Fix a bug in the ds1621 driver" * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (ds1621) Update zbits after conversion rate change
-rw-r--r--drivers/hwmon/ds1621.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index fc6f5d54e7f7..8890870309e4 100644
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -309,6 +309,7 @@ static ssize_t set_convrate(struct device *dev, struct device_attribute *da,
data->conf |= (resol << DS1621_REG_CONFIG_RESOL_SHIFT);
i2c_smbus_write_byte_data(client, DS1621_REG_CONF, data->conf);
data->update_interval = ds1721_convrates[resol];
+ data->zbits = 7 - resol;
mutex_unlock(&data->update_lock);
return count;