UPSTREAM/FIXUP: ASoC: rt5645: Replace direct snd_soc_codec dapm field access
I did not correctly fix the merge conflict when cherry-picking e2ada818
(CL:286297). This commit fixes it, and applies the correct conflict
resolution as performed upstream (commit f2a76385).
BUG=chrome-os-partner:40164
TEST=Boot oak-rev2
Change-Id: Iea590b2b21db638fecd4d1a1b1eb19a8bd4bed7c
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/287006
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index f885bfd..528fab5 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -3046,7 +3046,7 @@
switch (rt5645->codec_type) {
case CODEC_TYPE_RT5645:
- snd_soc_dapm_add_routes(dapm,
+ snd_soc_dapm_new_controls(dapm,
rt5645_specific_dapm_widgets,
ARRAY_SIZE(rt5645_specific_dapm_widgets));
snd_soc_dapm_add_routes(dapm,
