[alsa-devel] [PATCHv3] ASoC: simple-card: Fix bug of wrong decrement DT node's refcount
Xiubo Li
Li.Xiubo at freescale.com
Mon Sep 1 08:46:52 CEST 2014
DAI links's cpu_of_node's and codec_of_node's refcounts shouldn't
be decremented immediately at the end of the probe() fucntion.
Because we will still use them before the audio card is removed.
Signed-off-by: Xiubo Li <Li.Xiubo at freescale.com>
Cc: Jean-Francois Moine <moinejf at free.fr>
---
Change in v3:
- Follow Jean-Francois Moine's advice.
- Remove the following patch:
"ASoC: simple-card: Fix bug of forgetting decrement DT node's refcount"
sound/soc/generic/simple-card.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index fd8b045..986d2c7 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -481,12 +481,19 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
snd_soc_card_set_drvdata(&priv->snd_card, priv);
ret = devm_snd_soc_register_card(&pdev->dev, &priv->snd_card);
+ if (ret >= 0)
+ return ret;
err:
asoc_simple_card_unref(pdev);
return ret;
}
+static int asoc_simple_card_remove(struct platform_device *pdev)
+{
+ return asoc_simple_card_unref(pdev);
+}
+
static const struct of_device_id asoc_simple_of_match[] = {
{ .compatible = "simple-audio-card", },
{},
@@ -500,6 +507,7 @@ static struct platform_driver asoc_simple_card = {
.of_match_table = asoc_simple_of_match,
},
.probe = asoc_simple_card_probe,
+ .remove = asoc_simple_card_remove,
};
module_platform_driver(asoc_simple_card);
--
1.8.4
More information about the Alsa-devel
mailing list