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

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 0c19f84e661ad95fa6b585468f11d3cd97ea9527..ff0bce1a2d2cc8629636f8593b5e919c6adc6203 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -517,8 +517,8 @@ 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,
-               mask, value);
+       return snd_soc_component_update_bits(dapm->component, reg,
+                                            mask, value);
 }
 
 static int soc_dapm_test_bits(struct snd_soc_dapm_context *dapm,