diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-08-15 20:43:46 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-08-15 20:43:46 +0200 |
commit | f85a6597a6ce33fe4f390744b2764b30aa7bfda8 (patch) | |
tree | 9b923afc20e7d3a7e78f98d600fd7e6633b4265b /drivers/hwmon/max6697.c | |
parent | ALSA: usb-audio: Fix invalid volume resolution for Logitech HD Webcam C525 (diff) | |
parent | Merge remote-tracking branch 'asoc/fix/tegra' into asoc-linus (diff) | |
download | linux-dev-f85a6597a6ce33fe4f390744b2764b30aa7bfda8.tar.xz linux-dev-f85a6597a6ce33fe4f390744b2764b30aa7bfda8.zip |
Merge tag 'asoc-v3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.11
A few driver specific fixes here plus one core fix for a memory
corruption issue in DAPM initialisation which could lead to crashes.
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 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; } |