From 88dba174c9b2ed19f9ccc4d30f3d43a9e2dea87f Mon Sep 17 00:00:00 2001 From: Guodong Hu Date: Fri, 16 Oct 2020 11:01:51 +0800 Subject: [PATCH] asoc: avoid adding global control in loopback probing twice Add condition control to avoid mixer being added twice, to avoid kernel error printing. Change-Id: I832e4c08ac06fe885c1497bce4bd4ada96ef83fb Signed-off-by: Guodong Hu --- asoc/msm-pcm-loopback-v2.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/asoc/msm-pcm-loopback-v2.c b/asoc/msm-pcm-loopback-v2.c index 4ac424c5d045..03424cf9cc61 100644 --- a/asoc/msm-pcm-loopback-v2.c +++ b/asoc/msm-pcm-loopback-v2.c @@ -198,11 +198,15 @@ static struct snd_kcontrol_new msm_loopback_controls[] = { static int msm_pcm_loopback_probe(struct snd_soc_component *component) { - snd_soc_add_component_controls(component, msm_loopback_controls, - ARRAY_SIZE(msm_loopback_controls)); + if (of_property_read_bool(component->dev->of_node, + "qcom,msm-pcm-loopback")) { + snd_soc_add_component_controls(component, msm_loopback_controls, + ARRAY_SIZE(msm_loopback_controls)); + } return 0; } + static int pcm_loopback_set_volume(struct msm_pcm_loopback *prtd, uint32_t volume) {