summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-06-10 10:28:50 +0100
committerMark Brown <broonie@linaro.org>2013-06-10 10:28:50 +0100
commit4351ac5b9fb5df2f669c7bfba08c957fc201b150 (patch)
tree94c824f49fcdf419e392cd921bb4ac6de61cca00 /sound
parent97a47ce9d26db253d5eab8f90d186d9a46b77710 (diff)
parent2894770ec17ff732f911c8495ae0504f06a5dad5 (diff)
downloadlinux-4351ac5b9fb5df2f669c7bfba08c957fc201b150.tar.bz2
Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/tlv320aic3x.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 65d09d60b7c6..1514bf845e4b 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -187,14 +187,14 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol,
break;
}
-
- if (found)
- snd_soc_dapm_sync(widget->dapm);
}
- ret = snd_soc_update_bits(widget->codec, reg, val_mask, val);
-
mutex_unlock(&widget->codec->mutex);
+
+ if (found)
+ snd_soc_dapm_sync(widget->dapm);
+
+ ret = snd_soc_update_bits_locked(widget->codec, reg, val_mask, val);
return ret;
}