diff options
author | Jarkko Nikula <jhnikula@gmail.com> | 2010-12-14 05:18:30 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-15 13:00:41 -0500 |
commit | 8ddab3f5107c3955e70e87a632d4d179ddba1189 (patch) | |
tree | 639742e20df719e585f1f31896112fa08314f7a6 /sound/soc/soc-core.c | |
parent | 656d4b1edeb32a87042caee5694603706e399929 (diff) |
ASoC: Move DAPM paths from DAPM context to snd_soc_card
Decoupling DAPM paths from DAPM context is a first prerequisite when
extending ASoC core to cross-device paths. This patch is almost a nullop and
does not allow to construct cross-device setup but the path clean-up part in
dapm_free_widgets is prepared to remove cross-device paths between a device
being removed and others.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r-- | sound/soc/soc-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 1dc4b11c1988..bdb2ca9da58b 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
@@ -1879,6 +1879,7 @@ static int soc_probe(struct platform_device *pdev) | |||
1879 | INIT_LIST_HEAD(&card->dai_dev_list); | 1879 | INIT_LIST_HEAD(&card->dai_dev_list); |
1880 | INIT_LIST_HEAD(&card->codec_dev_list); | 1880 | INIT_LIST_HEAD(&card->codec_dev_list); |
1881 | INIT_LIST_HEAD(&card->platform_dev_list); | 1881 | INIT_LIST_HEAD(&card->platform_dev_list); |
1882 | INIT_LIST_HEAD(&card->paths); | ||
1882 | 1883 | ||
1883 | soc_init_card_debugfs(card); | 1884 | soc_init_card_debugfs(card); |
1884 | 1885 | ||
@@ -3481,7 +3482,6 @@ int snd_soc_register_codec(struct device *dev, | |||
3481 | codec->compress_type = SND_SOC_FLAT_COMPRESSION; | 3482 | codec->compress_type = SND_SOC_FLAT_COMPRESSION; |
3482 | 3483 | ||
3483 | INIT_LIST_HEAD(&codec->dapm.widgets); | 3484 | INIT_LIST_HEAD(&codec->dapm.widgets); |
3484 | INIT_LIST_HEAD(&codec->dapm.paths); | ||
3485 | codec->write = codec_drv->write; | 3485 | codec->write = codec_drv->write; |
3486 | codec->read = codec_drv->read; | 3486 | codec->read = codec_drv->read; |
3487 | codec->dapm.bias_level = SND_SOC_BIAS_OFF; | 3487 | codec->dapm.bias_level = SND_SOC_BIAS_OFF; |