projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/fix/pxa' and 'asoc/fix/tlv320aic3x' into asoc...
[cascardo/linux.git]
/
sound
/
soc
/
codecs
/
tlv320aic3x.c
diff --git
a/sound/soc/codecs/tlv320aic3x.c
b/sound/soc/codecs/tlv320aic3x.c
index
d7349bc
..
e12fafb
100644
(file)
--- 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;