diff options
Diffstat (limited to 'sound/soc/atmel/playpaq_wm8510.c')
-rw-r--r-- | sound/soc/atmel/playpaq_wm8510.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/soc/atmel/playpaq_wm8510.c b/sound/soc/atmel/playpaq_wm8510.c index 5f4e59f4461c..aede7e74ec34 100644 --- a/sound/soc/atmel/playpaq_wm8510.c +++ b/sound/soc/atmel/playpaq_wm8510.c | |||
@@ -318,27 +318,28 @@ static const struct snd_soc_dapm_route intercon[] = { | |||
318 | static int playpaq_wm8510_init(struct snd_soc_pcm_runtime *rtd) | 318 | static int playpaq_wm8510_init(struct snd_soc_pcm_runtime *rtd) |
319 | { | 319 | { |
320 | struct snd_soc_codec *codec = rtd->codec; | 320 | struct snd_soc_codec *codec = rtd->codec; |
321 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
321 | int i; | 322 | int i; |
322 | 323 | ||
323 | /* | 324 | /* |
324 | * Add DAPM widgets | 325 | * Add DAPM widgets |
325 | */ | 326 | */ |
326 | for (i = 0; i < ARRAY_SIZE(playpaq_dapm_widgets); i++) | 327 | for (i = 0; i < ARRAY_SIZE(playpaq_dapm_widgets); i++) |
327 | snd_soc_dapm_new_control(codec, &playpaq_dapm_widgets[i]); | 328 | snd_soc_dapm_new_control(dapm, &playpaq_dapm_widgets[i]); |
328 | 329 | ||
329 | 330 | ||
330 | 331 | ||
331 | /* | 332 | /* |
332 | * Setup audio path interconnects | 333 | * Setup audio path interconnects |
333 | */ | 334 | */ |
334 | snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon)); | 335 | snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon)); |
335 | 336 | ||
336 | 337 | ||
337 | 338 | ||
338 | /* always connected pins */ | 339 | /* always connected pins */ |
339 | snd_soc_dapm_enable_pin(codec, "Int Mic"); | 340 | snd_soc_dapm_enable_pin(dapm, "Int Mic"); |
340 | snd_soc_dapm_enable_pin(codec, "Ext Spk"); | 341 | snd_soc_dapm_enable_pin(dapm, "Ext Spk"); |
341 | snd_soc_dapm_sync(codec); | 342 | snd_soc_dapm_sync(dapm); |
342 | 343 | ||
343 | 344 | ||
344 | 345 | ||