redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: dapm: Adapt for debugfs API change 

Back in ff9fb72bc0 (debugfs: return error values, not NULL) the
debugfs APIs were changed to return error pointers rather than NULL
pointers on error, breaking the error checking in ASoC. Update the
code to use IS_ERR() and log the codes that are returned as part of
the error messages.

Fixes: ff9fb72bc0 (debugfs: return error values, not NULL)
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
alistair/sunxi64-5.4-dsi
Mark Brown 2019-06-21 12:33:57 +01:00
parent c2c928c931
commit ceaea851b9
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sound/soc/soc-dapm.c
View File

@ -2154,23 +2154,25 @@ void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm,
{
struct dentry *d;
if (!parent)
if (!parent || IS_ERR(parent))
return;
dapm->debugfs_dapm = debugfs_create_dir("dapm", parent);
if (!dapm->debugfs_dapm) {
if (IS_ERR(dapm->debugfs_dapm)) {
dev_warn(dapm->dev,
"ASoC: Failed to create DAPM debugfs directory\n");
"ASoC: Failed to create DAPM debugfs directory %ld\n",
PTR_ERR(dapm->debugfs_dapm));
return;
}
d = debugfs_create_file("bias_level", 0444,
dapm->debugfs_dapm, dapm,
&dapm_bias_fops);
if (!d)
if (IS_ERR(d))
dev_warn(dapm->dev,
"ASoC: Failed to create bias level debugfs file\n");
"ASoC: Failed to create bias level debugfs file: %ld\n",
PTR_ERR(d));
}
static void dapm_debugfs_add_widget(struct snd_soc_dapm_widget *w)
@ -2184,10 +2186,10 @@ static void dapm_debugfs_add_widget(struct snd_soc_dapm_widget *w)
d = debugfs_create_file(w->name, 0444,
dapm->debugfs_dapm, w,
&dapm_widget_power_fops);
if (!d)
if (IS_ERR(d))
dev_warn(w->dapm->dev,
"ASoC: Failed to create %s debugfs file\n",
w->name);
"ASoC: Failed to create %s debugfs file: %ld\n",
w->name, PTR_ERR(d));
}
static void dapm_debugfs_cleanup(struct snd_soc_dapm_context *dapm)