diff options
author | Mark Brown <broonie@linaro.org> | 2013-08-27 15:40:03 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-27 15:40:03 +0100 |
commit | dc1632321ba1e93dde25870e96cebe21b7d52517 (patch) | |
tree | d52d934c79b23f91654c571d983e1a6ec41b71fd /drivers/hwmon/max6697.c | |
parent | 8c193b8dce4f2a2474dc2bc39ec972454df9d439 (diff) | |
parent | a85f9da707366e856c0aad9e329db0cc59475290 (diff) |
Merge remote-tracking branch 'asoc/topic/dmic' into asoc-core
Diffstat (limited to 'drivers/hwmon/max6697.c')
-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 328fb0353c1..a41b5f3fc50 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; } |