diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2015-04-09 04:52:38 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-04-09 07:23:14 -0400 |
commit | 6553bf06a369683408895b87e5172aa99a9266bd (patch) | |
tree | 39ddb89fa018f224eb46b67894f0ff13ae986ac5 /sound/soc/soc-dapm.c | |
parent | 2e55b90a5e234524f8195c657006ec4f71103dff (diff) |
ASoC: Don't try to register debugfs entries if the parent does not exist
If the registration of a debugfs directory fails this is treated as a
non-fatal error in ASoC and operation continues as normal. This means we
need to be careful and check if the parent debugfs directory exists if we
try to register a debugfs file or sub-directory. Otherwise we might end up
passing NULL for the parent and the file or directory will be registered in
the top-level debugfs directory.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r-- | sound/soc/soc-dapm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index b6f88202b8c9..1fd2d458824e 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
@@ -1898,6 +1898,9 @@ void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm, | |||
1898 | { | 1898 | { |
1899 | struct dentry *d; | 1899 | struct dentry *d; |
1900 | 1900 | ||
1901 | if (!parent) | ||
1902 | return; | ||
1903 | |||
1901 | dapm->debugfs_dapm = debugfs_create_dir("dapm", parent); | 1904 | dapm->debugfs_dapm = debugfs_create_dir("dapm", parent); |
1902 | 1905 | ||
1903 | if (!dapm->debugfs_dapm) { | 1906 | if (!dapm->debugfs_dapm) { |