diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-03 14:14:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-03 14:14:25 -0400 |
| commit | 32c6e2587f3fe2658b6c67b6d2a0893dd359c13a (patch) | |
| tree | 5e2f103a82e316dd9576999c88b5c64ed4a8f596 /drivers | |
| parent | 9250d9047d99e8175cdf9b8e84952d2c69f3ed6d (diff) | |
| parent | 5c52add19733eb36d8619713312f5604efef3502 (diff) | |
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) | |||
| 605 | if (ret < 0) | 605 | if (ret < 0) |
| 606 | return ret; | 606 | return ret; |
| 607 | ret = i2c_smbus_write_byte_data(client, MAX6581_REG_IDEALITY, | 607 | ret = i2c_smbus_write_byte_data(client, MAX6581_REG_IDEALITY, |
| 608 | pdata->ideality_mask >> 1); | 608 | pdata->ideality_value); |
| 609 | if (ret < 0) | 609 | if (ret < 0) |
| 610 | return ret; | 610 | return ret; |
| 611 | ret = i2c_smbus_write_byte_data(client, | 611 | ret = i2c_smbus_write_byte_data(client, |
| 612 | MAX6581_REG_IDEALITY_SELECT, | 612 | MAX6581_REG_IDEALITY_SELECT, |
| 613 | pdata->ideality_value); | 613 | pdata->ideality_mask >> 1); |
| 614 | if (ret < 0) | 614 | if (ret < 0) |
| 615 | return ret; | 615 | return ret; |
| 616 | } | 616 | } |