Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus

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;
 }