diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-10-19 03:56:26 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-10-24 18:23:29 +0100 |
| commit | 0af5c01a79ade438698af683511803fc11291360 (patch) | |
| tree | cb84539c599004d98c0ec2a0418c86f3a207a17b /sound/soc/sh/rcar/ssi.c | |
| parent | 5490a109937b19464dc810389e69ff064afedf48 (diff) | |
| download | linux-0af5c01a79ade438698af683511803fc11291360.tar.bz2 | |
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/ssi.c')
| -rw-r--r-- | sound/soc/sh/rcar/ssi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 6cb6db005fc4..94a19f975fa2 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -698,7 +698,10 @@ static int rsnd_ssi_dma_remove(struct rsnd_mod *mod, int irq = ssi->irq; /* PIO will request IRQ again */ - devm_free_irq(dev, irq, mod); + if (ssi->dma) + devm_free_irq(dev, irq, mod); + + rsnd_dma_detach(mod, &ssi->dma); return 0; } |