Commit 06ee7095 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0e03f98c 39c627a0

drivers/hwmon/ds1621.c

+1 −0
Original line number Diff line number Diff line
@@ -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;