diff options
author | Jonas Bonn <jonas.bonn@gmail.com> | 2008-10-01 13:17:12 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-10-12 20:18:09 -0400 |
commit | e8089948d65911c78bcd72960dd419ec636d6f0b (patch) | |
tree | 4aaf492c8730a527b362a759aa27bb997ccfac74 /sound/soc/s3c24xx | |
parent | 5715952b39ebded49407ff02e58fe2d90904b991 (diff) |
ALSA: ASoC: Add widgets before setting endpoints on GTA01
This prevents error messages at startup where the endpoints are being
set before the widgets/controls have even been added.
Signed-off-by: Jonas Bonn <jonas.bonn@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/s3c24xx')
-rw-r--r-- | sound/soc/s3c24xx/neo1973_wm8753.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index 006c36ded257..9eda86259e69 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c | |||
@@ -518,13 +518,13 @@ static int neo1973_wm8753_init(struct snd_soc_codec *codec) | |||
518 | snd_soc_dapm_nc_pin(codec, "LINE1"); | 518 | snd_soc_dapm_nc_pin(codec, "LINE1"); |
519 | snd_soc_dapm_nc_pin(codec, "LINE2"); | 519 | snd_soc_dapm_nc_pin(codec, "LINE2"); |
520 | 520 | ||
521 | /* set endpoints to default mode */ | ||
522 | set_scenario_endpoints(codec, NEO_AUDIO_OFF); | ||
523 | |||
524 | /* Add neo1973 specific widgets */ | 521 | /* Add neo1973 specific widgets */ |
525 | snd_soc_dapm_new_controls(codec, wm8753_dapm_widgets, | 522 | snd_soc_dapm_new_controls(codec, wm8753_dapm_widgets, |
526 | ARRAY_SIZE(wm8753_dapm_widgets)); | 523 | ARRAY_SIZE(wm8753_dapm_widgets)); |
527 | 524 | ||
525 | /* set endpoints to default mode */ | ||
526 | set_scenario_endpoints(codec, NEO_AUDIO_OFF); | ||
527 | |||
528 | /* add neo1973 specific controls */ | 528 | /* add neo1973 specific controls */ |
529 | for (i = 0; i < ARRAY_SIZE(wm8753_neo1973_controls); i++) { | 529 | for (i = 0; i < ARRAY_SIZE(wm8753_neo1973_controls); i++) { |
530 | err = snd_ctl_add(codec->card, | 530 | err = snd_ctl_add(codec->card, |