diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-09 02:10:01 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-09 02:10:01 -0500 |
| commit | 03a3a2e25ff791f2870d477975a329a1c15eca26 (patch) | |
| tree | 711a3c0faa190ba84fdd4d53e1f8d264dc08333b /sound/soc | |
| parent | afcfe4359e32f4fe1588b1d60414aacce676e27a (diff) | |
| parent | fcf6c5ea7abd42cfc2dde0ff0451b209951de9b4 (diff) | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'sound/soc')
| -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 0c19f84e661a..ff0bce1a2d2c 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, | |||
| 517 | { | 517 | { |
| 518 | if (!dapm->component) | 518 | if (!dapm->component) |
| 519 | return -EIO; | 519 | return -EIO; |
| 520 | return snd_soc_component_update_bits_async(dapm->component, reg, | 520 | return snd_soc_component_update_bits(dapm->component, reg, |
| 521 | mask, value); | 521 | mask, value); |
| 522 | } | 522 | } |
| 523 | 523 | ||
| 524 | static int soc_dapm_test_bits(struct snd_soc_dapm_context *dapm, | 524 | static int soc_dapm_test_bits(struct snd_soc_dapm_context *dapm, |