Browse Source

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

Mark Brown 10 years ago
parent
commit
03a3a2e25f
1 changed files with 2 additions and 2 deletions
  1. 2 2
      sound/soc/soc-dapm.c

+ 2 - 2
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,