From a60373a3954187345606f623176a41f11db651c8 Mon Sep 17 00:00:00 2001 From: Rakesh Iyer Date: Mon, 30 Jan 2012 13:42:46 -0800 Subject: asoc: codecs: Fix build break for ALC5639 codec The vendor supplied driver has to be fixed to work on older kernels. Bug 931371 Signed-off-by: Rakesh Iyer Reviewed-on: http://git-master/r/78278 (cherry picked from commit ffce206b2d67bb9618a97d08e88c6ae25ba79baa) Change-Id: Ifd8712758307cd4f31526cc050c62a89187a7c8d Signed-off-by: Pritesh Raithatha Reviewed-on: http://git-master/r/82733 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Varun Wadekar Tested-by: Varun Wadekar Reviewed-by: Manoj Gangwal --- sound/soc/codecs/rt5639.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sound') diff --git a/sound/soc/codecs/rt5639.c b/sound/soc/codecs/rt5639.c index dfbbd8c81b3a..47e8d83d968b 100644 --- a/sound/soc/codecs/rt5639.c +++ b/sound/soc/codecs/rt5639.c @@ -2243,6 +2243,9 @@ static int rt5639_probe(struct snd_soc_codec *codec) codec->dapm.bias_level = SND_SOC_BIAS_STANDBY; + snd_soc_add_controls(codec, rt5639_snd_controls, + ARRAY_SIZE(rt5639_snd_controls)); + rt5639->codec = codec; ret = device_create_file(codec->dev, &dev_attr_index_reg); if (ret != 0) { @@ -2342,8 +2345,6 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5639 = { .volatile_register = rt5639_volatile_register, .readable_register = rt5639_readable_register, .reg_cache_step = 1, - .controls = rt5639_snd_controls, - .num_controls = ARRAY_SIZE(rt5639_snd_controls), .dapm_widgets = rt5639_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(rt5639_dapm_widgets), .dapm_routes = rt5639_dapm_routes, -- cgit v1.2.3