diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2017-03-28 02:31:23 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-03-29 12:01:10 +0100 |
| commit | e0c4211854bfebd5507761a2bfddaa9e37074230 (patch) | |
| tree | 50c8fd5e22e55e326e0d87e199dccc0324bae9dd /sound/soc/sh/rcar/dvc.c | |
| parent | 6b8530cc056efd4a11b034ca5b1e9f7e9563f553 (diff) | |
| download | op-kernel-dev-e0c4211854bfebd5507761a2bfddaa9e37074230.zip op-kernel-dev-e0c4211854bfebd5507761a2bfddaa9e37074230.tar.gz | |
ASoC: rcar: remove rsnd_kctrl_remove()
Current rcar driver is trying to remove kctrl when remove time.
But, 1) rcar driver can't/shouldn't remove before removing sound
card driver, 2) sound card driver will call snd_ctl_dev_free()
and removes all kctrls by snd_ctl_remove().
Thus, rsnd_kctrl_remove() is not necessary. Current implementation
will get Oops when removing rcar driver after sound card.
This patch fix this issue.
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/dvc.c')
| -rw-r--r-- | sound/soc/sh/rcar/dvc.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c index cf8f59c..994fdb7 100644 --- a/sound/soc/sh/rcar/dvc.c +++ b/sound/soc/sh/rcar/dvc.c @@ -218,21 +218,6 @@ static int rsnd_dvc_probe_(struct rsnd_mod *mod, return rsnd_cmd_attach(io, rsnd_mod_id(mod)); } -static int rsnd_dvc_remove_(struct rsnd_mod *mod, - struct rsnd_dai_stream *io, - struct rsnd_priv *priv) -{ - struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod); - - rsnd_kctrl_remove(dvc->volume); - rsnd_kctrl_remove(dvc->mute); - rsnd_kctrl_remove(dvc->ren); - rsnd_kctrl_remove(dvc->rup); - rsnd_kctrl_remove(dvc->rdown); - - return 0; -} - static int rsnd_dvc_init(struct rsnd_mod *mod, struct rsnd_dai_stream *io, struct rsnd_priv *priv) @@ -332,7 +317,6 @@ static struct rsnd_mod_ops rsnd_dvc_ops = { .name = DVC_NAME, .dma_req = rsnd_dvc_dma_req, .probe = rsnd_dvc_probe_, - .remove = rsnd_dvc_remove_, .init = rsnd_dvc_init, .quit = rsnd_dvc_quit, .pcm_new = rsnd_dvc_pcm_new, |
