summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorJonas Bonn <jonas.bonn@gmail.com>2008-10-01 18:17:12 +0100
committerTakashi Iwai <tiwai@suse.de>2008-10-13 02:18:09 +0200
commite8089948d65911c78bcd72960dd419ec636d6f0b (patch)
tree4aaf492c8730a527b362a759aa27bb997ccfac74 /sound/soc
parent5715952b39ebded49407ff02e58fe2d90904b991 (diff)
downloadop-kernel-dev-e8089948d65911c78bcd72960dd419ec636d6f0b.zip
op-kernel-dev-e8089948d65911c78bcd72960dd419ec636d6f0b.tar.gz
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')
-rw-r--r--sound/soc/s3c24xx/neo1973_wm8753.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c
index 006c36d..9eda862 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)
snd_soc_dapm_nc_pin(codec, "LINE1");
snd_soc_dapm_nc_pin(codec, "LINE2");
- /* set endpoints to default mode */
- set_scenario_endpoints(codec, NEO_AUDIO_OFF);
-
/* Add neo1973 specific widgets */
snd_soc_dapm_new_controls(codec, wm8753_dapm_widgets,
ARRAY_SIZE(wm8753_dapm_widgets));
+ /* set endpoints to default mode */
+ set_scenario_endpoints(codec, NEO_AUDIO_OFF);
+
/* add neo1973 specific controls */
for (i = 0; i < ARRAY_SIZE(wm8753_neo1973_controls); i++) {
err = snd_ctl_add(codec->card,
OpenPOWER on IntegriCloud