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 <[email protected]> --- sound/soc/generic/simple-card.c | 52 ++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 9675bf7..c774dab 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -295,6 +295,22 @@ dai_link_of_err: return ret; } +static inline void +asoc_simple_card_unref(const struct snd_soc_dai_link *dai_link, + int num_links) +{ + struct device_node *np; + + while (num_links--) { + np = dai_link[num_links].cpu_of_node; + if (np) + of_node_put(np); + np = dai_link[num_links].codec_of_node; + if (np) + of_node_put(np); + } +} + static int asoc_simple_card_parse_of(struct device_node *node, struct simple_card_data *priv, struct device *dev, @@ -340,6 +356,7 @@ static int asoc_simple_card_parse_of(struct device_node *node, ret = simple_card_dai_link_of(np, dev, dai_link + i, dai_props + i, false); if (ret < 0) { + asoc_simple_card_unref(dai_link, i + 1); of_node_put(np); return ret; } @@ -358,27 +375,6 @@ static int asoc_simple_card_parse_of(struct device_node *node, return 0; } -/* update the reference count of the devices nodes at end of probe */ -static int asoc_simple_card_unref(struct platform_device *pdev) -{ - struct snd_soc_card *card = platform_get_drvdata(pdev); - struct snd_soc_dai_link *dai_link; - struct device_node *np; - int num_links; - - for (num_links = 0, dai_link = card->dai_link; - num_links < card->num_links; - num_links++, dai_link++) { - np = (struct device_node *) dai_link->cpu_of_node; - if (np) - of_node_put(np); - np = (struct device_node *) dai_link->codec_of_node; - if (np) - of_node_put(np); - } - return 0; -} - static int asoc_simple_card_probe(struct platform_device *pdev) { struct simple_card_data *priv; @@ -425,7 +421,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev) if (ret < 0) { if (ret != -EPROBE_DEFER) dev_err(dev, "parse error %d\n", ret); - goto err; + return ret; } /* @@ -483,11 +479,18 @@ static int asoc_simple_card_probe(struct platform_device *pdev) ret = devm_snd_soc_register_card(&pdev->dev, &priv->snd_card); -err: - asoc_simple_card_unref(pdev); return ret; } +static int asoc_simple_card_remove(struct platform_device *pdev) +{ + struct snd_soc_card *card = platform_get_drvdata(pdev); + + asoc_simple_card_unref(card->dai_link, card->num_links); + + return 0; +} + static const struct of_device_id asoc_simple_of_match[] = { { .compatible = "simple-audio-card", }, {}, @@ -501,6 +504,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.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
