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

4351ac5b · Mark Brown · 97a47ce9 · 2894770e · 4351ac5b
Commit 4351ac5b authored Jun 10, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

sound/soc/codecs/tlv320aic3x.c sound/soc/codecs/tlv320aic3x.c +5 -5

No files found.
--- 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;
 }