Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next

03a3a2e2 · Mark Brown · afcfe435 · fcf6c5ea · 03a3a2e2
Commit 03a3a2e2 authored Feb 09, 2015 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sound/soc/soc-dapm.c sound/soc/soc-dapm.c +2 -2

No files found.
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -517,7 +517,7 @@ static int soc_dapm_update_bits(struct snd_soc_dapm_context *dapm,
 {
 	if (!dapm->component)
 		return -EIO;
-	return snd_soc_component_update_bits_async(dapm->component, reg,
+	return snd_soc_component_update_bits(dapm->component, reg,
 					     mask, value);
 }