diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2014-05-30 16:47:41 +0300 |
|---|---|---|
| committer | Darren Etheridge <detheridge@ti.com> | 2014-06-20 15:41:45 -0500 |
| commit | ba4f1d5cf4820466b0a3707fcb28459ff8fd6b96 (patch) | |
| tree | c00a592350a1d6f733dcfbf7d46278eeabe12bbd /sound | |
| parent | e0a79483508b5695f59d1cc4ea5d28e96b4e61e7 (diff) | |
ASoC: tlv320aci3x: Fix custom snd_soc_dapm_put_volsw_aic3x() function
[ Upstream commit e6c111fac4464e3f4bf7b3802b517dafc80f8e0f ]
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
Signed-off-by: Darren Etheridge <detheridge@ti.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 470fbfb4b38..eb241c6571a 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; |