diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-09 15:10:01 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-09 15:10:01 +0800 |
| commit | 03a3a2e25ff791f2870d477975a329a1c15eca26 (patch) | |
| tree | 711a3c0faa190ba84fdd4d53e1f8d264dc08333b /sound | |
| parent | afcfe4359e32f4fe1588b1d60414aacce676e27a (diff) | |
| parent | fcf6c5ea7abd42cfc2dde0ff0451b209951de9b4 (diff) | |
| download | op-kernel-dev-03a3a2e25ff791f2870d477975a329a1c15eca26.zip op-kernel-dev-03a3a2e25ff791f2870d477975a329a1c15eca26.tar.gz | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-dapm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 0c19f84e..ff0bce1 100644 --- 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, |
