From f42bb4e9c5e3257156ea3029bcf2a51b61296aa4 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Tue, 12 Apr 2011 19:31:03 +0200 Subject: [PATCH] --- yaml --- r: 248287 b: refs/heads/master c: 13319699113a78e90625ece124666d3ee53033f6 h: refs/heads/master i: 248285: 098ca614d00b79e571f0e51df5cae7cd471881c1 248283: ea1715d3ba54addc5f6abb2d828d5ed5a32ea2e3 248279: 4a196d24191e2717431583559e83889e38d4bfa1 248271: f835492fe97e226d14eab2e00c30a9bc5f59fe06 248255: 7705ecfd2761845e41ee0bc010e35d3a33f5f39e v: v3 --- [refs] | 2 +- trunk/sound/soc/jz4740/qi_lb60.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ee204ff2898c..37117d1bc222 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d06e48db1670b29b3f62f1dfe4a36af237d5aa0d +refs/heads/master: 13319699113a78e90625ece124666d3ee53033f6 diff --git a/trunk/sound/soc/jz4740/qi_lb60.c b/trunk/sound/soc/jz4740/qi_lb60.c index 49723e3e7e38..875abc94a00b 100644 --- a/trunk/sound/soc/jz4740/qi_lb60.c +++ b/trunk/sound/soc/jz4740/qi_lb60.c @@ -70,12 +70,6 @@ static int qi_lb60_codec_init(struct snd_soc_pcm_runtime *rtd) return ret; } - snd_soc_dapm_new_controls(dapm, qi_lb60_widgets, - ARRAY_SIZE(qi_lb60_widgets)); - snd_soc_dapm_add_routes(dapm, qi_lb60_routes, - ARRAY_SIZE(qi_lb60_routes)); - snd_soc_dapm_sync(dapm); - return 0; } @@ -93,6 +87,11 @@ static struct snd_soc_card qi_lb60 = { .name = "QI LB60", .dai_link = &qi_lb60_dai, .num_links = 1, + + .dapm_widgets = qi_lb60_widgets, + .num_dapm_widgets = ARRAY_SIZE(qi_lb60_widgets), + .dapm_routes = qi_lb60_routes, + .num_dapm_routes = ARRAY_SIZE(qi_lb60_routes), }; static struct platform_device *qi_lb60_snd_device;