summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorLars-Peter Clausen2015-04-09 10:52:37 +0200
committerMark Brown2015-04-09 12:32:29 +0200
commit2e55b90a5e234524f8195c657006ec4f71103dff (patch)
tree060bbeb681c5744cce98db58918ed4581eb48a6a /sound/soc/soc-core.c
parentASoC: Create card debugfs directory earlier (diff)
downloadkernel-qcow2-linux-2e55b90a5e234524f8195c657006ec4f71103dff.tar.gz
kernel-qcow2-linux-2e55b90a5e234524f8195c657006ec4f71103dff.tar.xz
kernel-qcow2-linux-2e55b90a5e234524f8195c657006ec4f71103dff.zip
ASoC: Make soc_dpcm_debugfs_add() non-fatal
Failing to register the debugfs entries is not fatal and will not affect normal operation of the sound card. Don't abort the card registration if soc_dpcm_debugfs_add() fails. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 3f18fa7f090d..d29c68ad83c7 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1328,15 +1328,8 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
#ifdef CONFIG_DEBUG_FS
/* add DPCM sysfs entries */
- if (dai_link->dynamic) {
- ret = soc_dpcm_debugfs_add(rtd);
- if (ret < 0) {
- dev_err(rtd->dev,
- "ASoC: failed to add dpcm sysfs entries: %d\n",
- ret);
- return ret;
- }
- }
+ if (dai_link->dynamic)
+ soc_dpcm_debugfs_add(rtd);
#endif
if (cpu_dai->driver->compress_dai) {