diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-03 11:14:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-03 11:14:25 -0700 |
| commit | 32c6e2587f3fe2658b6c67b6d2a0893dd359c13a (patch) | |
| tree | 5e2f103a82e316dd9576999c88b5c64ed4a8f596 /drivers | |
| parent | Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm (diff) | |
| parent | hwmon: (max6697) fix MAX6581 ideality (diff) | |
| download | linux-dev-32c6e2587f3fe2658b6c67b6d2a0893dd359c13a.tar.xz linux-dev-32c6e2587f3fe2658b6c67b6d2a0893dd359c13a.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 chip initialization/configuration in MAX6697 driver"
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (max6697) fix MAX6581 ideality
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/max6697.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/max6697.c b/drivers/hwmon/max6697.c index 328fb0353c17..a41b5f3fc506 100644 --- a/drivers/hwmon/max6697.c +++ b/drivers/hwmon/max6697.c @@ -605,12 +605,12 @@ static int max6697_init_chip(struct i2c_client *client) if (ret < 0) return ret; ret = i2c_smbus_write_byte_data(client, MAX6581_REG_IDEALITY, - pdata->ideality_mask >> 1); + pdata->ideality_value); if (ret < 0) return ret; ret = i2c_smbus_write_byte_data(client, MAX6581_REG_IDEALITY_SELECT, - pdata->ideality_value); + pdata->ideality_mask >> 1); if (ret < 0) return ret; } |