diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2008-10-17 17:51:11 +0200 |
|---|---|---|
| committer | Jean Delvare <khali@mahadeva.delvare> | 2008-10-17 17:51:11 +0200 |
| commit | 49ae6cc8005f45edadf237089c31885834f2608e (patch) | |
| tree | b8fa52e5eb4af19f7ff7438067cf2876ca382a06 /drivers/hwmon/lm87.c | |
| parent | 4b4e7a72fda549e309919931d8a39dea4e5b4be1 (diff) | |
| download | op-kernel-dev-49ae6cc8005f45edadf237089c31885834f2608e.zip op-kernel-dev-49ae6cc8005f45edadf237089c31885834f2608e.tar.gz | |
hwmon: (lm87) Fix masking of config register in lm87_init_client()
lm87_init_client() conditionally sets the Start bit and clears the
INT#_Clear bit in the Config 1 register. The condition should be that
either of these bits needs changing, but currently it checks the
(self-clearing) Initialization bit instead of INT#_Clear.
Fix the condition and also ensure we never set the Initialization bit.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/hwmon/lm87.c')
| -rw-r--r-- | drivers/hwmon/lm87.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c index 21970f0..0fecbfd 100644 --- a/drivers/hwmon/lm87.c +++ b/drivers/hwmon/lm87.c @@ -867,11 +867,11 @@ static void lm87_init_client(struct i2c_client *client) lm87_write_value(client, LM87_REG_IN_MAX(0), 0xFF); } } - if ((config & 0x81) != 0x01) { - /* Start monitoring */ + + /* Make sure Start is set and INT#_Clear is clear */ + if ((config & 0x09) != 0x01) lm87_write_value(client, LM87_REG_CONFIG, - (config & 0xF7) | 0x01); - } + (config & 0x77) | 0x01); } static int lm87_remove(struct i2c_client *client) |
