diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-10-19 05:56:26 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-10-24 19:23:29 +0200 |
| commit | 0af5c01a79ade438698af683511803fc11291360 (patch) | |
| tree | cb84539c599004d98c0ec2a0418c86f3a207a17b /sound/soc/sh/rcar/dma.c | |
| parent | ASoC: rsnd: remove duplicate define of rsnd_dvc_of_node() (diff) | |
| download | linux-0af5c01a79ade438698af683511803fc11291360.tar.xz linux-0af5c01a79ade438698af683511803fc11291360.zip | |
ASoC: rsnd: amend .probe/.remove call for DPCM
commit 1a5658c2131 ("ASoC: rsnd: count .probe/.remove for
rsnd_mod_call()") solved multi-resource-free issue, by putting
.probe/.remove under count control. But,it breaks sound mixing case
(if it was used under DPCM). In such case, it uses MIXn/DVCn/SSIn,
and these should be always probed.
This patch reverted above patch, and solved the same issue by
modifing _rsnd_kctrl_remove() function.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sh/rcar/dma.c')
| -rw-r--r-- | sound/soc/sh/rcar/dma.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c index 6bc93cbb3049..b3bdd362a511 100644 --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c @@ -707,6 +707,17 @@ int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod, return 0; } +void rsnd_dma_detach(struct rsnd_mod *mod, struct rsnd_mod **dma_mod) +{ + if (*dma_mod) { + struct rsnd_priv *priv = rsnd_mod_to_priv(mod); + struct device *dev = rsnd_priv_to_dev(priv); + + devm_kfree(dev, *dma_mod); + *dma_mod = NULL; + } +} + int rsnd_dma_probe(struct rsnd_priv *priv) { struct platform_device *pdev = rsnd_priv_to_pdev(priv); |