diff options
| author | Xiubo Li <Li.Xiubo@freescale.com> | 2014-09-01 08:46:52 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-01 18:48:07 +0200 |
| commit | e3c4a28b611b03d69bfbdffda985ef0dd94c2794 (patch) | |
| tree | afcd63e086b61b3e7f1cd91dac29479c7df4acee /sound/soc/generic | |
| parent | Linux 3.17-rc1 (diff) | |
| download | linux-e3c4a28b611b03d69bfbdffda985ef0dd94c2794.tar.xz linux-e3c4a28b611b03d69bfbdffda985ef0dd94c2794.zip | |
ASoC: simple-card: Fix bug of wrong decrement DT node's refcount
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@freescale.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/generic')
| -rw-r--r-- | sound/soc/generic/simple-card.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 159e517fa09a..cef7776b712c 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); |