diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2011-10-10 08:34:08 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-10 11:18:10 -0400 |
commit | cb4248779d317eb5a0f554b298134689c395c4fd (patch) | |
tree | be884463fe2b096c5753d6de0cf47d5ceee7c83b /sound/soc/omap/omap3pandora.c | |
parent | 03b5362d2fef02cabbbb440d861d27e40ed3a929 (diff) |
ASoC: OMAP machines: Remove soc_dapm_sync() call from init
No need to call soc_dapm_sync at init time.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Anuj Aggarwal <anuj.aggarwal@ti.com>
Cc: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Cc: Jarkko Nikula <jarkko.nikula@bitmer.com>
Cc: GraÅžvydas Ignotas <notasas@gmail.com>
Cc: Misael Lopez Cruz <misael.lopez@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/omap/omap3pandora.c')
-rw-r--r-- | sound/soc/omap/omap3pandora.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c index 3ae87fd36612..30a75b406aea 100644 --- a/sound/soc/omap/omap3pandora.c +++ b/sound/soc/omap/omap3pandora.c | |||
@@ -173,10 +173,8 @@ static int omap3pandora_out_init(struct snd_soc_pcm_runtime *rtd) | |||
173 | if (ret < 0) | 173 | if (ret < 0) |
174 | return ret; | 174 | return ret; |
175 | 175 | ||
176 | snd_soc_dapm_add_routes(dapm, omap3pandora_out_map, | 176 | return snd_soc_dapm_add_routes(dapm, omap3pandora_out_map, |
177 | ARRAY_SIZE(omap3pandora_out_map)); | 177 | ARRAY_SIZE(omap3pandora_out_map)); |
178 | |||
179 | return snd_soc_dapm_sync(dapm); | ||
180 | } | 178 | } |
181 | 179 | ||
182 | static int omap3pandora_in_init(struct snd_soc_pcm_runtime *rtd) | 180 | static int omap3pandora_in_init(struct snd_soc_pcm_runtime *rtd) |
@@ -196,10 +194,8 @@ static int omap3pandora_in_init(struct snd_soc_pcm_runtime *rtd) | |||
196 | if (ret < 0) | 194 | if (ret < 0) |
197 | return ret; | 195 | return ret; |
198 | 196 | ||
199 | snd_soc_dapm_add_routes(dapm, omap3pandora_in_map, | 197 | return snd_soc_dapm_add_routes(dapm, omap3pandora_in_map, |
200 | ARRAY_SIZE(omap3pandora_in_map)); | 198 | ARRAY_SIZE(omap3pandora_in_map)); |
201 | |||
202 | return snd_soc_dapm_sync(dapm); | ||
203 | } | 199 | } |
204 | 200 | ||
205 | static struct snd_soc_ops omap3pandora_ops = { | 201 | static struct snd_soc_ops omap3pandora_ops = { |