hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

soc-core: don't call kfree() for component 

When driver register its component to ALSA SoC, almost all drivers are
using snd_soc_register_component(), but soc-generic-dmaengine-pcm is
using snd_soc_add_component().

Existing component function had been assumed that registered component
was allocated, and it calling kfree() for it.
But, the user who used snd_soc_add_component() doesn't.

This patch uses devm_kzalloc() instead of kzalloc() for component,
and doesn't call kree() anymore.
This patch fixes commit be7ee5f32a ("ASoC: soc-generic-dmaengine-pcm:
replace platform to component").
Allwinner H3 SoC will crash without this patch.
Thanks Jernej report.

Reported-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2018-03-19 07:27:17 +00:00 committed by Mark Brown
parent 66717d787a
commit 7ecbd6a91b
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3454,7 +3454,6 @@ int snd_soc_add_component(struct device *dev,
err_cleanup: err_cleanup:
snd_soc_component_cleanup(component); snd_soc_component_cleanup(component);
err_free: err_free:
kfree(component);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(snd_soc_add_component); EXPORT_SYMBOL_GPL(snd_soc_add_component);
@ -3466,7 +3465,7 @@ int snd_soc_register_component(struct device *dev,
{ {
struct snd_soc_component *component; struct snd_soc_component *component;
component = kzalloc(sizeof(*component), GFP_KERNEL); component = devm_kzalloc(dev, sizeof(*component), GFP_KERNEL);
if (!component) if (!component)
return -ENOMEM; return -ENOMEM;
@ -3501,7 +3500,6 @@ static int __snd_soc_unregister_component(struct device *dev)
if (found) { if (found) {
snd_soc_component_cleanup(component); snd_soc_component_cleanup(component);
kfree(component);
} }
return found; return found;