| From 98d887f76cc877b80837645608710f3ceedb1817 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 30 Jul 2020 13:07:14 +0100 |
| Subject: ASoC: soc-core: Fix regression causing sysfs entries to disappear |
| |
| From: Charles Keepax <ckeepax@opensource.cirrus.com> |
| |
| [ 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> |
| --- |
| sound/soc/soc-core.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c |
| index e5433e8fcf19e..b5c4473f1e499 100644 |
| --- 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: |
| -- |
| 2.25.1 |
| |
