diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2011-04-08 07:50:44 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-11 22:31:52 +0200 |
| commit | 0671fd8ef4b32200e75396cd299f0853002fc11e (patch) | |
| tree | 02f465d78fc59406ba7740664a94f61ce912f71f /sound/soc | |
| parent | ASoC: SAMSUNG: Add WM8580 PCM Machine driver (diff) | |
| download | linux-0671fd8ef4b32200e75396cd299f0853002fc11e.tar.xz linux-0671fd8ef4b32200e75396cd299f0853002fc11e.zip | |
ASoC: Add soc_remove_dai_links
card->num_rtd should be 0 after soc_romve_dai_link
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/soc-core.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index f75f13926049..1f114673e952 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1453,6 +1453,16 @@ static void soc_remove_dai_link(struct snd_soc_card *card, int num) } } +static void soc_remove_dai_links(struct snd_soc_card *card) +{ + int i; + + for (i = 0; i < card->num_rtd; i++) + soc_remove_dai_link(card, i); + + card->num_rtd = 0; +} + static void soc_set_name_prefix(struct snd_soc_card *card, struct snd_soc_codec *codec) { @@ -1960,8 +1970,7 @@ probe_aux_dev_err: soc_remove_aux_dev(card, i); probe_dai_err: - for (i = 0; i < card->num_links; i++) - soc_remove_dai_link(card, i); + soc_remove_dai_links(card); card_probe_error: if (card->remove) @@ -2023,8 +2032,7 @@ static int soc_cleanup_card_resources(struct snd_soc_card *card) soc_remove_aux_dev(card, i); /* remove and free each DAI */ - for (i = 0; i < card->num_rtd; i++) - soc_remove_dai_link(card, i); + soc_remove_dai_links(card); soc_cleanup_card_debugfs(card); |