diff options
| author | Mark Brown <broonie@kernel.org> | 2019-04-04 15:07:34 +0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-04-04 15:07:34 +0700 |
| commit | 072cb68a43663eacae7fe84dcbfd1a81dc692185 (patch) | |
| tree | 95107e9ba2b85f6aabee0c830603a2cc48d32d07 /sound/soc/soc-dapm.c | |
| parent | 252163a66a06859f468ef1e00fa5a1f377b16eed (diff) | |
| parent | 86a7b6ffd90095d81d9fa0d8b48955b7c83b2e2f (diff) | |
| download | linux-072cb68a43663eacae7fe84dcbfd1a81dc692185.tar.gz linux-072cb68a43663eacae7fe84dcbfd1a81dc692185.tar.bz2 linux-072cb68a43663eacae7fe84dcbfd1a81dc692185.zip | |
Merge branch 'asoc-5.1' into asoc-5.2
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 74a6f5705f66..65ee0bb5dd0b 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3650,6 +3650,13 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, case snd_soc_dapm_dac: case snd_soc_dapm_aif_in: case snd_soc_dapm_pga: + case snd_soc_dapm_buffer: + case snd_soc_dapm_scheduler: + case snd_soc_dapm_effect: + case snd_soc_dapm_src: + case snd_soc_dapm_asrc: + case snd_soc_dapm_encoder: + case snd_soc_dapm_decoder: case snd_soc_dapm_out_drv: case snd_soc_dapm_micbias: case snd_soc_dapm_line: @@ -3957,6 +3964,10 @@ snd_soc_dapm_free_kcontrol(struct snd_soc_card *card, int count; devm_kfree(card->dev, (void *)*private_value); + + if (!w_param_text) + return; + for (count = 0 ; count < num_params; count++) devm_kfree(card->dev, (void *)w_param_text[count]); devm_kfree(card->dev, w_param_text); |