diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2015-02-01 23:53:53 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-02 13:37:56 -0500 |
commit | d1f83d6ef43bf1b4a3d19805098b3a9724047479 (patch) | |
tree | d128fc580e3644c40eed162a98a0e7c6cdfccb68 /sound/soc/sh/rcar/rsnd.h | |
parent | 8048b91ffca872d704b7e7fb404a121955ce8d8e (diff) |
ASoC: rsnd: call missing snd_ctl_remove()
Current Renesas R-Car sound driver is using snd_ctl_xxx()
functions, but it didn't call snd_ctl free_one() / snd_ctl_remove().
This patch call these functions.
Reported-by: Nguyen Viet Dung <nv-dung@jinso.co.jp>
Reported-by: Bui Duc Phuc <bd-phuc@jinso.co.jp>
Reported-by: Cao Minh Hiep <cm-hiep@jinso.co.jp>
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/rsnd.h')
-rw-r--r-- | sound/soc/sh/rcar/rsnd.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index b57d8ace012a..e7914bd610e2 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h | |||
@@ -436,6 +436,8 @@ struct rsnd_kctrl_cfg { | |||
436 | u32 *val; | 436 | u32 *val; |
437 | const char * const *texts; | 437 | const char * const *texts; |
438 | void (*update)(struct rsnd_mod *mod); | 438 | void (*update)(struct rsnd_mod *mod); |
439 | struct snd_card *card; | ||
440 | struct snd_kcontrol *kctrl; | ||
439 | }; | 441 | }; |
440 | 442 | ||
441 | #define RSND_DVC_CHANNELS 2 | 443 | #define RSND_DVC_CHANNELS 2 |
@@ -449,6 +451,9 @@ struct rsnd_kctrl_cfg_s { | |||
449 | u32 val; | 451 | u32 val; |
450 | }; | 452 | }; |
451 | 453 | ||
454 | void _rsnd_kctrl_remove(struct rsnd_kctrl_cfg *cfg); | ||
455 | #define rsnd_kctrl_remove(_cfg) _rsnd_kctrl_remove(&((_cfg).cfg)) | ||
456 | |||
452 | int rsnd_kctrl_new_m(struct rsnd_mod *mod, | 457 | int rsnd_kctrl_new_m(struct rsnd_mod *mod, |
453 | struct snd_soc_pcm_runtime *rtd, | 458 | struct snd_soc_pcm_runtime *rtd, |
454 | const unsigned char *name, | 459 | const unsigned char *name, |