UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: core: 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>
This commit is contained in:
Mark Brown 2019-06-21 12:33:56 +01:00
parent b545542a0b
commit c2c928c931
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sound/soc/soc-core.c
View File

@ -158,9 +158,10 @@ static void soc_init_component_debugfs(struct snd_soc_component *component)
component->card->debugfs_card_root); component->card->debugfs_card_root);
} }
if (!component->debugfs_root) { if (IS_ERR(component->debugfs_root)) {
dev_warn(component->dev, dev_warn(component->dev,
"ASoC: Failed to create component debugfs directory\n"); "ASoC: Failed to create component debugfs directory: %ld\n",
PTR_ERR(component->debugfs_root));
return; return;
} }
@ -212,18 +213,21 @@ static void soc_init_card_debugfs(struct snd_soc_card *card)
card->debugfs_card_root = debugfs_create_dir(card->name, card->debugfs_card_root = debugfs_create_dir(card->name,
snd_soc_debugfs_root); snd_soc_debugfs_root);
if (!card->debugfs_card_root) { if (IS_ERR(card->debugfs_card_root)) {
dev_warn(card->dev, dev_warn(card->dev,
"ASoC: Failed to create card debugfs directory\n"); "ASoC: Failed to create card debugfs directory: %ld\n",
PTR_ERR(card->debugfs_card_root));
card->debugfs_card_root = NULL;
return; return;
} }
card->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0644, card->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0644,
card->debugfs_card_root, card->debugfs_card_root,
&card->pop_time); &card->pop_time);
if (!card->debugfs_pop_time) if (IS_ERR(card->debugfs_pop_time))
dev_warn(card->dev, dev_warn(card->dev,
"ASoC: Failed to create pop time debugfs file\n"); "ASoC: Failed to create pop time debugfs file: %ld\n",
PTR_ERR(card->debugfs_pop_time));
} }
static void soc_cleanup_card_debugfs(struct snd_soc_card *card) static void soc_cleanup_card_debugfs(struct snd_soc_card *card)