diff options
| author | Kuninori Morimoto | 2018-03-19 08:27:17 +0100 |
|---|---|---|
| committer | Mark Brown | 2018-03-19 09:06:36 +0100 |
| commit | 7ecbd6a91b1e9bb90a4f3be641669347aacc5ab5 (patch) | |
| tree | 6a01c76f63f7b1e7b9c10aa292cf1bba78b6abad /sound/soc/soc-core.c | |
| parent | ASoC: mediatek: mt2701: drop unnessary snd_soc_unregister_component() (diff) | |
| download | kernel-qcow2-linux-7ecbd6a91b1e9bb90a4f3be641669347aacc5ab5.tar.gz kernel-qcow2-linux-7ecbd6a91b1e9bb90a4f3be641669347aacc5ab5.tar.xz kernel-qcow2-linux-7ecbd6a91b1e9bb90a4f3be641669347aacc5ab5.zip | |
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 be7ee5f32a9a ("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>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 9558125b448d..8b1ef90f7b57 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3454,7 +3454,6 @@ int snd_soc_add_component(struct device *dev, err_cleanup: snd_soc_component_cleanup(component); err_free: - kfree(component); return ret; } EXPORT_SYMBOL_GPL(snd_soc_add_component); @@ -3466,7 +3465,7 @@ int snd_soc_register_component(struct device *dev, { struct snd_soc_component *component; - component = kzalloc(sizeof(*component), GFP_KERNEL); + component = devm_kzalloc(dev, sizeof(*component), GFP_KERNEL); if (!component) return -ENOMEM; @@ -3501,7 +3500,6 @@ static int __snd_soc_unregister_component(struct device *dev) if (found) { snd_soc_component_cleanup(component); - kfree(component); } return found; |