diff options
| author | Mark Brown <broonie@kernel.org> | 2020-08-25 11:00:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-08-25 11:00:43 +0100 |
| commit | 1959ba4e40ce40c380dbe868433f5c4b20bb1ba3 (patch) | |
| tree | 0bd58aa5433f8d4c207c058c259ec18fcba3e0f2 /sound/soc/soc-core.c | |
| parent | 0235bc04627d02a08f7ad9d226a8fe78e6c4a1c3 (diff) | |
| parent | d012a7190fc1fd72ed48911e77ca97ba4521bccd (diff) | |
| download | linux-1959ba4e40ce40c380dbe868433f5c4b20bb1ba3.tar.gz linux-1959ba4e40ce40c380dbe868433f5c4b20bb1ba3.tar.bz2 linux-1959ba4e40ce40c380dbe868433f5c4b20bb1ba3.zip | |
Merge tag 'v5.9-rc2' into asoc-5.9
Linux 5.9-rc2
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index fe23e936e2d1..2fe1b2ec7c8f 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -446,7 +446,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); @@ -503,6 +502,10 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime( /* see for_each_card_rtds */ list_add_tail(&rtd->list, &card->rtd_list); + ret = device_add_groups(dev, soc_dev_attr_groups); + if (ret < 0) + goto free_rtd; + return rtd; free_rtd: |