diff options
Diffstat (limited to 'sound/soc/pxa/z2.c')
-rw-r--r-- | sound/soc/pxa/z2.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c index d69d9fc32233..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) | |||
161 | /* Set up z2 specific audio paths */ | 161 | /* Set up z2 specific audio paths */ |
162 | snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); | 162 | snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); |
163 | 163 | ||
164 | ret = snd_soc_dapm_sync(dapm); | ||
165 | if (ret) | ||
166 | goto err; | ||
167 | |||
168 | /* Jack detection API stuff */ | 164 | /* Jack detection API stuff */ |
169 | ret = snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET, | 165 | ret = snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET, |
170 | &hs_jack); | 166 | &hs_jack); |
@@ -198,7 +194,7 @@ static struct snd_soc_dai_link z2_dai = { | |||
198 | .cpu_dai_name = "pxa2xx-i2s", | 194 | .cpu_dai_name = "pxa2xx-i2s", |
199 | .codec_dai_name = "wm8750-hifi", | 195 | .codec_dai_name = "wm8750-hifi", |
200 | .platform_name = "pxa-pcm-audio", | 196 | .platform_name = "pxa-pcm-audio", |
201 | .codec_name = "wm8750-codec.0-001b", | 197 | .codec_name = "wm8750.0-001b", |
202 | .init = z2_wm8750_init, | 198 | .init = z2_wm8750_init, |
203 | .ops = &z2_ops, | 199 | .ops = &z2_ops, |
204 | }; | 200 | }; |