From c3c3c5c90b49c5ecb83e9efb5d3066df30f3ffe3 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 28 Dec 2011 19:03:23 +0800 Subject: [PATCH] --- yaml --- r: 284027 b: refs/heads/master c: 5f5de18a7f81382fead581efc489dfcfa34601af h: refs/heads/master i: 284025: 914385c437ed0be31dc4b94f78750a48207d0510 284023: 0a19a89fd9ec28434bed1e6b24d56e9b40720323 v: v3 --- [refs] | 2 +- trunk/sound/soc/kirkwood/kirkwood-t5325.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 98fc407e6a9e..738d7968a695 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e0d6ac0d894ebae2ff85ea6108dd065a274dfb9 +refs/heads/master: 5f5de18a7f81382fead581efc489dfcfa34601af diff --git a/trunk/sound/soc/kirkwood/kirkwood-t5325.c b/trunk/sound/soc/kirkwood/kirkwood-t5325.c index 6e992307c252..b47cc4e9b746 100644 --- a/trunk/sound/soc/kirkwood/kirkwood-t5325.c +++ b/trunk/sound/soc/kirkwood/kirkwood-t5325.c @@ -59,11 +59,6 @@ static int t5325_dai_init(struct snd_soc_pcm_runtime *rtd) struct snd_soc_codec *codec = rtd->codec; struct snd_soc_dapm_context *dapm = &codec->dapm; - snd_soc_dapm_new_controls(dapm, t5325_dapm_widgets, - ARRAY_SIZE(t5325_dapm_widgets)); - - snd_soc_dapm_add_routes(dapm, t5325_route, ARRAY_SIZE(t5325_route)); - snd_soc_dapm_enable_pin(dapm, "Mic Jack"); snd_soc_dapm_enable_pin(dapm, "Headphone Jack"); snd_soc_dapm_enable_pin(dapm, "Speaker"); @@ -91,6 +86,11 @@ static struct snd_soc_card t5325 = { .owner = THIS_MODULE, .dai_link = t5325_dai, .num_links = ARRAY_SIZE(t5325_dai), + + .dapm_widgets = t5325_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(t5325_dapm_widgets), + .dapm_routes = t5325_route, + .num_dapm_routes = ARRAY_SIZE(t5325_route), }; static struct platform_device *t5325_snd_device;