February 2019 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ALSA: hda/ca0132: need CONFIG_PCI for compile
by Kuninori Morimoto 05 Feb '19

05 Feb '19

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> commit d99501b8575d ("ALSA: hda/ca0132 - Call pci_iounmap() instead of iounmap()") started to use pci_iounmap() on ca0132, but then, it should be depends on CONFIG_PCI. Otherwise, non CONFIG_PCI compile will be failed, like below linux/sound/pci/hda/patch_ca0132.c: In function 'ca0132_free': linux/sound/pci/hda/patch_ca0132.c:8455:3: error: implicit\ declaration of function 'pci_iounmap'; did you mean\ 'pcim_iounmap'? [-Werror=implicit-function-declaration] pci_iounmap(codec->bus->pci, spec->mem_base); ^~~~~~~~~~~ Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/pci/hda/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig index 4235907..03af159 100644 --- a/sound/pci/hda/Kconfig +++ b/sound/pci/hda/Kconfig @@ -171,6 +171,7 @@ comment "Set to Y if you want auto-loading the codec driver" config SND_HDA_CODEC_CA0132 tristate "Build Creative CA0132 codec support" + depends on CONFIG_PCI help Say Y or M here to include Creative CA0132 codec support in snd-hda-intel driver. -- 2.7.4

2 2

[alsa-devel] [PATCH v3 1/2] ASoC: dapm: fix out-of-bounds accesses to DAPM lookup tables
by Pierre-Louis Bossart 05 Feb '19

05 Feb '19

KASAN reports and additional traces point to out-of-bounds accesses to the dapm_up_seq and dapm_down_seq lookup tables. The indices used are larger than the array definition. Fix by adding missing entries for the new widget types in these two lookup tables, and align them with PGA values. Also the sequences for the following widgets were not defined. Since their values defaulted to zero, assign them explicitly snd_soc_dapm_input snd_soc_dapm_output snd_soc_dapm_vmid snd_soc_dapm_siggen snd_soc_dapm_sink Fixes: 8a70b4544ef4 ('ASoC: dapm: Add new widget type for constructing DAPM graphs on DSPs.'). Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/soc-dapm.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 5b74dffc9c11..2bf5bab579de 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -70,12 +70,16 @@ static int dapm_up_seq[] = { [snd_soc_dapm_clock_supply] = 1, [snd_soc_dapm_supply] = 2, [snd_soc_dapm_micbias] = 3, + [snd_soc_dapm_vmid] = 3, [snd_soc_dapm_dai_link] = 2, [snd_soc_dapm_dai_in] = 4, [snd_soc_dapm_dai_out] = 4, [snd_soc_dapm_aif_in] = 4, [snd_soc_dapm_aif_out] = 4, [snd_soc_dapm_mic] = 5, + [snd_soc_dapm_siggen] = 5, + [snd_soc_dapm_input] = 5, + [snd_soc_dapm_output] = 5, [snd_soc_dapm_mux] = 6, [snd_soc_dapm_demux] = 6, [snd_soc_dapm_dac] = 7, @@ -83,11 +87,19 @@ static int dapm_up_seq[] = { [snd_soc_dapm_mixer] = 8, [snd_soc_dapm_mixer_named_ctl] = 8, [snd_soc_dapm_pga] = 9, + [snd_soc_dapm_buffer] = 9, + [snd_soc_dapm_scheduler] = 9, + [snd_soc_dapm_effect] = 9, + [snd_soc_dapm_src] = 9, + [snd_soc_dapm_asrc] = 9, + [snd_soc_dapm_encoder] = 9, + [snd_soc_dapm_decoder] = 9, [snd_soc_dapm_adc] = 10, [snd_soc_dapm_out_drv] = 11, [snd_soc_dapm_hp] = 11, [snd_soc_dapm_spk] = 11, [snd_soc_dapm_line] = 11, + [snd_soc_dapm_sink] = 11, [snd_soc_dapm_kcontrol] = 12, [snd_soc_dapm_post] = 13, }; @@ -100,13 +112,25 @@ static int dapm_down_seq[] = { [snd_soc_dapm_spk] = 3, [snd_soc_dapm_line] = 3, [snd_soc_dapm_out_drv] = 3, + [snd_soc_dapm_sink] = 3, [snd_soc_dapm_pga] = 4, + [snd_soc_dapm_buffer] = 4, + [snd_soc_dapm_scheduler] = 4, + [snd_soc_dapm_effect] = 4, + [snd_soc_dapm_src] = 4, + [snd_soc_dapm_asrc] = 4, + [snd_soc_dapm_encoder] = 4, + [snd_soc_dapm_decoder] = 4, [snd_soc_dapm_switch] = 5, [snd_soc_dapm_mixer_named_ctl] = 5, [snd_soc_dapm_mixer] = 5, [snd_soc_dapm_dac] = 6, [snd_soc_dapm_mic] = 7, + [snd_soc_dapm_siggen] = 7, + [snd_soc_dapm_input] = 7, + [snd_soc_dapm_output] = 7, [snd_soc_dapm_micbias] = 8, + [snd_soc_dapm_vmid] = 8, [snd_soc_dapm_mux] = 9, [snd_soc_dapm_demux] = 9, [snd_soc_dapm_aif_in] = 10, -- 2.17.1

2 5

[alsa-devel] [resend] [PATCH] ASoC: rsnd: fixup rsnd_ssi_master_clk_start() user count check
by Kuninori Morimoto 05 Feb '19

05 Feb '19

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> commit 4d230d1271064 ("ASoC: rsnd: fixup not to call clk_get/set under non-atomic") added new rsnd_ssi_prepare() and moved rsnd_ssi_master_clk_start() to .prepare. But, ssi user count (= ssi->usrcnt) is incremented at .init (= rsnd_ssi_init()). Because of these timing exchange, ssi->usrcnt check at rsnd_ssi_master_clk_start() should be adjusted. Otherwise, 2nd master clock setup will be no check. This patch fixup this issue. Fixes: commit 4d230d1271064 ("ASoC: rsnd: fixup not to call clk_get/set under non-atomic") Reported-by: Yusuke Goda <yusuke.goda.sx(a)renesas.com> Reported-by: Valentine Barshak <valentine.barshak(a)cogentembedded.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Tested-by: Yusuke Goda <yusuke.goda.sx(a)renesas.com> --- Mark this is for v5.0 sound/soc/sh/rcar/ssi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 45ef295..f5afab6 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -286,7 +286,7 @@ static int rsnd_ssi_master_clk_start(struct rsnd_mod *mod, if (rsnd_ssi_is_multi_slave(mod, io)) return 0; - if (ssi->usrcnt > 1) { + if (ssi->usrcnt > 0) { if (ssi->rate != rate) { dev_err(dev, "SSI parent/child should use same rate\n"); return -EINVAL; -- 2.7.4 _______________________________________________ Alsa-devel mailing list Alsa-devel(a)alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

1 0

[alsa-devel] [asoc:for-5.1 100/129] sound/soc/codecs/wcd9335.c:2168:5-8: Unneeded variable: "ret". Return "0" on line 2182 (fwd)
by Julia Lawall 04 Feb '19

04 Feb '19

It's a small thing, but just returning 0 would be a little bit more clear than setting ret to 0 and then returning that. julia ---------- Forwarded message ---------- Date: Tue, 5 Feb 2019 05:57:05 +0800 From: kbuild test robot <lkp(a)intel.com> To: kbuild(a)01.org Cc: Julia Lawall <julia.lawall(a)lip6.fr> Subject: [asoc:for-5.1 100/129] sound/soc/codecs/wcd9335.c:2168:5-8: Unneeded variable: "ret". Return "0" on line 2182 CC: kbuild-all(a)01.org CC: alsa-devel(a)alsa-project.org TO: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> CC: Mark Brown <broonie(a)kernel.org> CC: Vinod Koul <vkoul(a)kernel.org> tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.1 head: 0f747bb273790f49be4660521d86d7cebd1bbe1e commit: 354461486f66e4311d9412c53205d773aac85b78 [100/129] ASoC: wcd9335: add playback dapm widgets :::::: branch date: 6 hours ago :::::: commit date: 7 days ago >> sound/soc/codecs/wcd9335.c:2168:5-8: Unneeded variable: "ret". Return "0" on line 2182 sound/soc/codecs/wcd9335.c:2498:5-8: Unneeded variable: "ret". Return "0" on line 2528 sound/soc/codecs/wcd9335.c:2302:5-8: Unneeded variable: "ret". Return "0" on line 2341 sound/soc/codecs/wcd9335.c:2453:5-8: Unneeded variable: "ret". Return "0" on line 2491 sound/soc/codecs/wcd9335.c:1583:5-8: Unneeded variable: "ret". Return "0" on line 1595 # https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git/commit/?i… git remote add asoc https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git git remote update asoc git checkout 354461486f66e4311d9412c53205d773aac85b78 vim +2168 sound/soc/codecs/wcd9335.c 35446148 Srinivas Kandagatla 2019-01-28 2162 35446148 Srinivas Kandagatla 2019-01-28 2163 static int wcd9335_codec_ear_dac_event(struct snd_soc_dapm_widget *w, 35446148 Srinivas Kandagatla 2019-01-28 2164 struct snd_kcontrol *kc, int event) 35446148 Srinivas Kandagatla 2019-01-28 2165 { 35446148 Srinivas Kandagatla 2019-01-28 2166 struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm); 35446148 Srinivas Kandagatla 2019-01-28 2167 struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev); 35446148 Srinivas Kandagatla 2019-01-28 @2168 int ret = 0; 35446148 Srinivas Kandagatla 2019-01-28 2169 35446148 Srinivas Kandagatla 2019-01-28 2170 switch (event) { 35446148 Srinivas Kandagatla 2019-01-28 2171 case SND_SOC_DAPM_PRE_PMU: 35446148 Srinivas Kandagatla 2019-01-28 2172 wcd_clsh_ctrl_set_state(wcd->clsh_ctrl, WCD_CLSH_EVENT_PRE_DAC, 35446148 Srinivas Kandagatla 2019-01-28 2173 WCD_CLSH_STATE_EAR, CLS_H_NORMAL); 35446148 Srinivas Kandagatla 2019-01-28 2174 35446148 Srinivas Kandagatla 2019-01-28 2175 break; 35446148 Srinivas Kandagatla 2019-01-28 2176 case SND_SOC_DAPM_POST_PMD: 35446148 Srinivas Kandagatla 2019-01-28 2177 wcd_clsh_ctrl_set_state(wcd->clsh_ctrl, WCD_CLSH_EVENT_POST_PA, 35446148 Srinivas Kandagatla 2019-01-28 2178 WCD_CLSH_STATE_EAR, CLS_H_NORMAL); 35446148 Srinivas Kandagatla 2019-01-28 2179 break; 35446148 Srinivas Kandagatla 2019-01-28 2180 }; 35446148 Srinivas Kandagatla 2019-01-28 2181 35446148 Srinivas Kandagatla 2019-01-28 @2182 return ret; 35446148 Srinivas Kandagatla 2019-01-28 2183 } 35446148 Srinivas Kandagatla 2019-01-28 2184 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH 0/5] ALSA: Fix remaining NULL device with memory allocations
by Takashi Iwai 04 Feb '19

04 Feb '19

Hi, this patchset covers the still remaining drivers calling the memory allocation with NULL device pointer. Simply card->dev is passed there. Mark, two of them are trivial fixes for ASoC, and I'd like to merge them through my tree, since the last patch adds an explicit WARN_ON(). Give me Ack's if they are OK. thanks, Takashi === Takashi Iwai (5): ALSA: x86: Avoid passing NULL to memory allocators ALSA: arm: Avoid passing NULL to memory allocators ASoC: amd: Avoid passing NULL to memory allocators ASoC: sh: Avoid passing NULL to memory allocators ALSA: core: Don't allow NULL device for memory allocation sound/arm/aaci.c | 3 ++- sound/core/memalloc.c | 2 ++ sound/soc/amd/raven/acp3x-pcm-dma.c | 3 ++- sound/soc/sh/siu_pcm.c | 2 +- sound/x86/intel_hdmi_audio.c | 3 ++- 5 files changed, 9 insertions(+), 4 deletions(-) -- 2.16.4

3 8

[alsa-devel] [PATCH v2] ASoC: dapm: fix out-of-bounds accesses to DAPM lookup tables
by Pierre-Louis Bossart 04 Feb '19

04 Feb '19

KASAN reports and additional traces point to out-of-bounds accesses to the dapm_up_seq and dapm_down_seq lookup tables. The indices used are larger than the array definition. Fix by adding missing entries for the new widget types in these two lookup tables, and align them with PGA values. Also the sequences for the following widgets were not defined. Since their values defaulted to zero, assign them explicitly snd_soc_dapm_input snd_soc_dapm_output snd_soc_dapm_vmid snd_soc_dapm_siggen snd_soc_dapm_sink Fixes: 8a70b4544ef4 ('ASoC: dapm: Add new widget type for constructing DAPM graphs on DSPs.'). Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- v2: fixed mistake with mic (was already handled) use values recommended by Mark sound/soc/soc-dapm.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 5b74dffc9c11..2bf5bab579de 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -70,12 +70,16 @@ static int dapm_up_seq[] = { [snd_soc_dapm_clock_supply] = 1, [snd_soc_dapm_supply] = 2, [snd_soc_dapm_micbias] = 3, + [snd_soc_dapm_vmid] = 3, [snd_soc_dapm_dai_link] = 2, [snd_soc_dapm_dai_in] = 4, [snd_soc_dapm_dai_out] = 4, [snd_soc_dapm_aif_in] = 4, [snd_soc_dapm_aif_out] = 4, [snd_soc_dapm_mic] = 5, + [snd_soc_dapm_siggen] = 5, + [snd_soc_dapm_input] = 5, + [snd_soc_dapm_output] = 5, [snd_soc_dapm_mux] = 6, [snd_soc_dapm_demux] = 6, [snd_soc_dapm_dac] = 7, @@ -83,11 +87,19 @@ static int dapm_up_seq[] = { [snd_soc_dapm_mixer] = 8, [snd_soc_dapm_mixer_named_ctl] = 8, [snd_soc_dapm_pga] = 9, + [snd_soc_dapm_buffer] = 9, + [snd_soc_dapm_scheduler] = 9, + [snd_soc_dapm_effect] = 9, + [snd_soc_dapm_src] = 9, + [snd_soc_dapm_asrc] = 9, + [snd_soc_dapm_encoder] = 9, + [snd_soc_dapm_decoder] = 9, [snd_soc_dapm_adc] = 10, [snd_soc_dapm_out_drv] = 11, [snd_soc_dapm_hp] = 11, [snd_soc_dapm_spk] = 11, [snd_soc_dapm_line] = 11, + [snd_soc_dapm_sink] = 11, [snd_soc_dapm_kcontrol] = 12, [snd_soc_dapm_post] = 13, }; @@ -100,13 +112,25 @@ static int dapm_down_seq[] = { [snd_soc_dapm_spk] = 3, [snd_soc_dapm_line] = 3, [snd_soc_dapm_out_drv] = 3, + [snd_soc_dapm_sink] = 3, [snd_soc_dapm_pga] = 4, + [snd_soc_dapm_buffer] = 4, + [snd_soc_dapm_scheduler] = 4, + [snd_soc_dapm_effect] = 4, + [snd_soc_dapm_src] = 4, + [snd_soc_dapm_asrc] = 4, + [snd_soc_dapm_encoder] = 4, + [snd_soc_dapm_decoder] = 4, [snd_soc_dapm_switch] = 5, [snd_soc_dapm_mixer_named_ctl] = 5, [snd_soc_dapm_mixer] = 5, [snd_soc_dapm_dac] = 6, [snd_soc_dapm_mic] = 7, + [snd_soc_dapm_siggen] = 7, + [snd_soc_dapm_input] = 7, + [snd_soc_dapm_output] = 7, [snd_soc_dapm_micbias] = 8, + [snd_soc_dapm_vmid] = 8, [snd_soc_dapm_mux] = 9, [snd_soc_dapm_demux] = 9, [snd_soc_dapm_aif_in] = 10, -- 2.17.1

3 5

[alsa-devel] [PATCH 0/3 v5] ALSA: pcm: anonymous dup implementation
by Jaroslav Kysela 04 Feb '19

04 Feb '19

This patchset contains the anonymous dup implementation with permissions checking for the ALSA's PCM interface in kernel to enable the restricted DMA sound buffer sharing for the restricted tasks. The code was tested through qemu and it seems to be pretty stable. The initial tinyalsa implementation can be found here: https://github.com/perexg/tinyalsa/commits/anondup The filtering might be refined. It depends on the real requirements. Perhaps, we may create more ioctl groups. Any comments are more than welcome. v2 of the patches: - change clone parameter to subdevice number for the pcm attach - change SNDRV_PCM_PERM_MAX to SNDRV_PCM_PERM_MASK - the tinyalsa implementation was a little updated (restructured) v3 of the patches: - group integer declarations in snd_pcm_anonymous_dup() - replaced substream->pcm with pcm in snd_pcm_anonymous_dup() - added SNDRV_PCM_PERM_RW check for read/write/readv/writev syscalls v4 of the patches: - more simple restriction control (only two modes - full/buffer) - the tinyalsa implementation follows this change v5 of the patches: - merge pcm_..._mmap_allowed fcns to the snd_pcm_mmap_... fcns Cc: Phil Burk <philburk(a)google.com> Cc: Zach Riggle <riggle(a)google.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Leo Yan <leo.yan(a)linaro.org> Cc: Baolin Wang <baolin.wang(a)linaro.org> Jaroslav Kysela (3): ALSA: pcm: implement the anonymous dup (inode file descriptor) ALSA: pcm: merge pcm_..._mmap_allowed fcns to the snd_pcm_mmap_... fcns ALSA: pcm: implement the mmap buffer mode for the anonymous dup include/sound/pcm.h | 10 +-- include/uapi/sound/asound.h | 6 +- sound/core/oss/pcm_oss.c | 2 +- sound/core/pcm.c | 13 ++-- sound/core/pcm_compat.c | 1 + sound/core/pcm_native.c | 151 ++++++++++++++++++++++++++++++++------------ 6 files changed, 130 insertions(+), 53 deletions(-) -- 2.13.6

2 5

[alsa-devel] [PATCH][next] ASoC: mediatek: btcvsd: fix spelling mistake "offest" -> "offset"
by Colin King 04 Feb '19

04 Feb '19

From: Colin Ian King <colin.king(a)canonical.com> There is a spelling mistake in a dev_warn message. Fix this. Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/mediatek/common/mtk-btcvsd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/mediatek/common/mtk-btcvsd.c b/sound/soc/mediatek/common/mtk-btcvsd.c index 349a9120a0dd..e408c1b270ab 100644 --- a/sound/soc/mediatek/common/mtk-btcvsd.c +++ b/sound/soc/mediatek/common/mtk-btcvsd.c @@ -1309,7 +1309,7 @@ static int mtk_btcvsd_snd_probe(struct platform_device *pdev) offset, ARRAY_SIZE(offset)); if (ret) { - dev_warn(dev, "%s(), get offest fail, ret %d\n", __func__, ret); + dev_warn(dev, "%s(), get offset fail, ret %d\n", __func__, ret); return ret; } btcvsd->infra_misc_offset = offset[0]; -- 2.20.1

2 1

[alsa-devel] [PATCH] ASoC: ak4118: fix missing header
by Clément Péron 04 Feb '19

04 Feb '19

This driver use the gpio consumer interface. Add the header as it's needed. Signed-off-by: Clément Péron <peron.clem(a)gmail.com> --- This has been triggered by Kbuild-all for information: https://lists.01.org/pipermail/kbuild-all/2019-February/057379.html sound/soc/codecs/ak4118.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/ak4118.c b/sound/soc/codecs/ak4118.c index 238ab29f2bf4..ce419e8cf890 100644 --- a/sound/soc/codecs/ak4118.c +++ b/sound/soc/codecs/ak4118.c @@ -6,6 +6,7 @@ */ #include <linux/i2c.h> +#include <linux/gpio/consumer.h> #include <linux/module.h> #include <linux/of_device.h> #include <linux/of_gpio.h> -- 2.19.1

2 1

[alsa-devel] [PATCH v2] ASoC: topology: unload physical dai link in remove
by Pierre-Louis Bossart 04 Feb '19

04 Feb '19

From: Bard liao <yung-chuan.liao(a)linux.intel.com> soc_tplg_link_config() will find the physical dai link and call soc_tplg_dai_link_load() to load the BE dai link. Currently remove_link() is only used to remove the FE dai link which is created by the topology. The BE dai link cannot however be unloaded in snd_soc_tplg_component _remove(), which is problematic if anything needs to be released or reinitialized. This patch aligns the definitions of dynamic types with the existing UAPI and adds a new remove_backend_link() routine to unload the the BE dai link when snd_soc_tplg_component_remove() is invoked. Signed-off-by: Bard liao <yung-chuan.liao(a)linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- v2: reset the dobj.type to fix module load/unload issues include/sound/soc-topology.h | 1 + sound/soc/soc-topology.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/include/sound/soc-topology.h b/include/sound/soc-topology.h index 8c43cfc240fa..5223896de26f 100644 --- a/include/sound/soc-topology.h +++ b/include/sound/soc-topology.h @@ -45,6 +45,7 @@ enum snd_soc_dobj_type { SND_SOC_DOBJ_DAI_LINK, SND_SOC_DOBJ_PCM, SND_SOC_DOBJ_CODEC_LINK, + SND_SOC_DOBJ_BACKEND_LINK, }; /* dynamic control object */ diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index bb7e5422a419..c5638e15a2dd 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -562,6 +562,25 @@ static void remove_link(struct snd_soc_component *comp, kfree(link); } +/* unload dai link */ +static void remove_backend_link(struct snd_soc_component *comp, + struct snd_soc_dobj *dobj, int pass) +{ + if (pass != SOC_TPLG_PASS_LINK) + return; + + if (dobj->ops && dobj->ops->link_unload) + dobj->ops->link_unload(comp, dobj); + + /* + * We don't free the link here as what remove_link() do since BE + * links are not allocated by topology. + * We however need to reset the dobj type to its initial values + */ + dobj->type = SND_SOC_DOBJ_NONE; + list_del(&dobj->list); +} + /* bind a kcontrol to it's IO handlers */ static int soc_tplg_kcontrol_bind_io(struct snd_soc_tplg_ctl_hdr *hdr, struct snd_kcontrol_new *k, @@ -2168,6 +2187,12 @@ static int soc_tplg_link_config(struct soc_tplg *tplg, return ret; } + /* for unloading it in snd_soc_tplg_component_remove */ + link->dobj.index = tplg->index; + link->dobj.ops = tplg->ops; + link->dobj.type = SND_SOC_DOBJ_BACKEND_LINK; + list_add(&link->dobj.list, &tplg->comp->dobj_list); + return 0; } @@ -2654,6 +2679,13 @@ int snd_soc_tplg_component_remove(struct snd_soc_component *comp, u32 index) case SND_SOC_DOBJ_DAI_LINK: remove_link(comp, dobj, pass); break; + case SND_SOC_DOBJ_BACKEND_LINK: + /* + * call link_unload ops if extra + * deinitialization is needed. + */ + remove_backend_link(comp, dobj, pass); + break; default: dev_err(comp->dev, "ASoC: invalid component type %d for removal\n", dobj->type); -- 2.17.1

2 1