ASoC: soc-core: Fix regression causing sysfs entries to disappear

[ Upstream commit 5c74c9d34aec1ac756de6979dd5580096aba8643 ]

The allocation order of things in soc_new_pcm_runtime was changed to
move the device_register before the allocation of the rtd structure.
This was to allow the rtd allocation to be managed by devm. However
currently the sysfs entries are added by device_register and their
visibility depends on variables within the rtd structure, this causes
the pmdown_time and dapm_widgets sysfs entries to be missing for all
rtds.

Correct this issue by manually calling device_add_groups after the
appropriate information is available.

Fixes: d918a37610b1 ("ASoC: soc-core: tidyup soc_new_pcm_runtime() alloc order")
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20200730120715.637-1-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index e5433e8fcf19e5f111cdb7fffe1d68de7693974d..b5c4473f1e499aed198593d63ed44e7baec70eaf 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -443,7 +443,6 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime(
 
        dev->parent     = card->dev;
        dev->release    = soc_release_rtd_dev;
-       dev->groups     = soc_dev_attr_groups;
 
        dev_set_name(dev, "%s", dai_link->name);
 
@@ -502,6 +501,10 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime(
        rtd->num = card->num_rtd;
        card->num_rtd++;
 
+       ret = device_add_groups(dev, soc_dev_attr_groups);
+       if (ret < 0)
+               goto free_rtd;
+
        return rtd;
 
 free_rtd: