soc-core: don't call kfree() for component
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 19 Mar 2018 07:27:17 +0000 (07:27 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 19 Mar 2018 08:06:36 +0000 (16:06 +0800)
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>
sound/soc/soc-core.c

index 9558125..8b1ef90 100644 (file)
@@ -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;