From cd7455606faadb0df12eb635c5892da07e980e9a Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sat, 31 Dec 2011 08:45:01 +0800 Subject: [PATCH] --- yaml --- r: 284075 b: refs/heads/master c: 1a2dbcbe0491bdfd4fc2484a9853a019f9e21a9c h: refs/heads/master i: 284073: 02404e21b6d5141f657c854a1d80a0a81a96489c 284071: f46db5200dbf0df1c25974b34df53315fb9318c8 v: v3 --- [refs] | 2 +- trunk/sound/soc/pxa/tavorevb3.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ead20df5103d..1ab5e4c66975 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c27426356c185ac9f8af8c77889b51d1442a2ac +refs/heads/master: 1a2dbcbe0491bdfd4fc2484a9853a019f9e21a9c diff --git a/trunk/sound/soc/pxa/tavorevb3.c b/trunk/sound/soc/pxa/tavorevb3.c index 4bef12cd424d..56ee82f61189 100644 --- a/trunk/sound/soc/pxa/tavorevb3.c +++ b/trunk/sound/soc/pxa/tavorevb3.c @@ -51,7 +51,7 @@ static const struct snd_soc_dapm_widget evb3_dapm_widgets[] = { }; /* tavorevb3 machine audio map */ -static const struct snd_soc_dapm_route audio_map[] = { +static const struct snd_soc_dapm_route evb3_audio_map[] = { {"Headset Stereophone", NULL, "HS1"}, {"Headset Stereophone", NULL, "HS2"}, @@ -128,17 +128,17 @@ static struct snd_soc_card snd_soc_card_evb3 = { .owner = THIS_MODULE, .dai_link = evb3_dai, .num_links = ARRAY_SIZE(evb3_dai), + + .dapm_widgets = evb3_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(evb3_dapm_widgets), + .dapm_routes = evb3_audio_map, + .num_dapm_routes = ARRAY_SIZE(evb3_audio_map), }; static int evb3_pm860x_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_codec *codec = rtd->codec; struct snd_soc_dapm_context *dapm = &codec->dapm; - int ret; - - snd_soc_dapm_new_controls(dapm, evb3_dapm_widgets, - ARRAY_SIZE(evb3_dapm_widgets)); - snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); /* connected pins */ snd_soc_dapm_enable_pin(dapm, "Ext Speaker");