Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next (03a3a2e2) · Commits · e / devices / android_kernel_teracube_2e

sound/soc/soc-dapm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}