summaryrefslogtreecommitdiff
path: root/sound/soc/pxa/z2.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-10-08 13:29:18 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-10-08 14:10:54 +0100
commit87bea31c7b59a07fe5a1c827eb01db3b7c3ae672 (patch)
tree79ad5ea9603bef2db55d50610a2d9e2ba3076409 /sound/soc/pxa/z2.c
parent4f4c0072228785179d35b2bd9e48081ce9fa51f6 (diff)
ASoC: Remove redundant snd_soc_dapm_sync() calls from machine drivers
The core will sync DAPM as part of the card initialization, there is no need for machine drivers to do so during their setup. OMAP drivers are omitted as I know Peter already has patches for them. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/pxa/z2.c')
-rw-r--r--sound/soc/pxa/z2.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c
index 4b81ffd87566..b311ffe04b71 100644
--- a/sound/soc/pxa/z2.c
+++ b/sound/soc/pxa/z2.c
@@ -161,10 +161,6 @@ static int z2_wm8750_init(struct snd_soc_pcm_runtime *rtd)
/* Set up z2 specific audio paths */
snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
- ret = snd_soc_dapm_sync(dapm);
- if (ret)
- goto err;
-
/* Jack detection API stuff */
ret = snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET,
&hs_jack);