summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorPeter Ujfalusi2014-05-30 15:47:41 +0200
committerMark Brown2014-06-01 12:43:02 +0200
commite6c111fac4464e3f4bf7b3802b517dafc80f8e0f (patch)
tree311ff8b40d7faf07afcee0d2bc0eb83473fe886a /sound/soc/codecs
parentLinux 3.15-rc1 (diff)
downloadkernel-qcow2-linux-e6c111fac4464e3f4bf7b3802b517dafc80f8e0f.tar.gz
kernel-qcow2-linux-e6c111fac4464e3f4bf7b3802b517dafc80f8e0f.tar.xz
kernel-qcow2-linux-e6c111fac4464e3f4bf7b3802b517dafc80f8e0f.zip
ASoC: tlv320aci3x: Fix custom snd_soc_dapm_put_volsw_aic3x() function
For some unknown reason the parameters for snd_soc_test_bits() were in wrong order: It was: snd_soc_test_bits(codec, val, mask, reg); /* WRONG!!! */ while it should be: snd_soc_test_bits(codec, reg, mask, val); Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org> Cc: stable@vger.kernel.org
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/tlv320aic3x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index b1835103e9b4..54983939c955 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -169,7 +169,7 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol,
mask <<= shift;
val <<= shift;
- change = snd_soc_test_bits(codec, val, mask, reg);
+ change = snd_soc_test_bits(codec, reg, mask, val);
if (change) {
update.kcontrol = kcontrol;
update.reg = reg;