[PATCH 15/20] ALSA: Add widgets before setting endpoints
Jonas Bonn
jonas.bonn at gmail.com
Wed Oct 1 21:47:27 CEST 2008
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 at gmail.com>
---
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 3537f53..ca6e10c 100644
--- a/sound/soc/s3c24xx/neo1973_wm8753.c
+++ b/sound/soc/s3c24xx/neo1973_wm8753.c
@@ -517,13 +517,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,
--
1.5.4.3
More information about the openmoko-kernel
mailing list