korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-20 10:44:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: soc-core: clear platform pointers on error

Browse Source 
Originally snd_soc_init_platform was not cleaning up its pointers, this
was fixed to always reallocate dynamic memory but created a memory leak
when snd_soc_init_platform was called multiple times during the same
probe attempt and also threw away any changes made to the struct between
calls. In order to avoid reallocating memory that is still valid, the
behaviour will be changed to clear the dynamically set pointers on a
probe error and a unregister event and snd_soc_init_platform will go
back to its original behaviour of only allocating null pointers so it will
stop throwing away valid changes.

Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Curtis Malainey 2019-01-29 13:47:09 -08:00 committed by Mark Brown
parent 11907e9d35
commit 78a24e10cd
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sound/soc/soc-core.c
View File

@ -1048,7 +1048,7 @@ static int snd_soc_init_platform(struct snd_soc_card *card,
* soc.h :: struct snd_soc_dai_link
*/
/* convert Legacy platform link */
if (!platform || dai_link->legacy_platform) {
if (!platform) {
platform = devm_kzalloc(card->dev,
sizeof(struct snd_soc_dai_link_component),
GFP_KERNEL);
@ -1071,6 +1071,24 @@ static int snd_soc_init_platform(struct snd_soc_card *card,
return 0;
}
static void soc_cleanup_platform(struct snd_soc_card *card)
{
struct snd_soc_dai_link *link;
int i;
/*
* FIXME
*
* this function should be removed with snd_soc_init_platform
*/
for_each_card_prelinks(card, i, link) {
if (link->legacy_platform) {
link->legacy_platform = 0;
link->platforms = NULL;
}
}
}
static int snd_soc_init_multicodec(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_link)
{
@ -2015,6 +2033,7 @@ static int soc_cleanup_card_resources(struct snd_soc_card *card)
/* remove and free each DAI */
soc_remove_dai_links(card);
soc_remove_pcm_runtimes(card);
soc_cleanup_platform(card);
/* remove auxiliary devices */
soc_remove_aux_devices(card);