diff options
author | Mark Brown <broonie@kernel.org> | 2022-11-29 12:55:12 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2022-11-29 12:55:51 +0000 |
commit | aeb2e9c4eedc6fed264a51ca2ea17c83984d2a64 (patch) | |
tree | 3d80758082c0a3bc293761cc1a4cbac2e457b128 /sound/soc/soc-core.c | |
parent | 863b9179cee4570e5da4206dcf8dbcdcc37c8348 (diff) | |
parent | 3d1bb6cc1a654c8693a85b1d262e610196edec8b (diff) |
ASoC: Merge up fixes
Merge the fixes branch up so we can apply further AMD work.
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r-- | sound/soc/soc-core.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index d8b092f129ae..e613698824fd 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3477,10 +3477,23 @@ EXPORT_SYMBOL_GPL(snd_soc_of_get_dai_link_cpus); static int __init snd_soc_init(void) { + int ret; + snd_soc_debugfs_init(); - snd_soc_util_init(); + ret = snd_soc_util_init(); + if (ret) + goto err_util_init; - return platform_driver_register(&soc_driver); + ret = platform_driver_register(&soc_driver); + if (ret) + goto err_register; + return 0; + +err_register: + snd_soc_util_exit(); +err_util_init: + snd_soc_debugfs_exit(); + return ret; } module_init(snd_soc_init); |