Skip to content

Commit

Permalink
thermal/debugfs: Fix the NULL vs IS_ERR() confusion in debugfs_create…
Browse files Browse the repository at this point in the history
…_dir()

The debugfs_create_dir() return value is never NULL, it is either a
valid pointer or an error one.

Use IS_ERR() to check it.

Fixes: 7ef01f2 ("thermal/debugfs: Add thermal debugfs information for mitigation episodes")
Fixes: 755113d ("thermal/debugfs: Add thermal cooling device debugfs information")
Signed-off-by: Yang Ruibin <11162571@vivo.com>
Link: https://patch.msgid.link/20240821075934.12145-1-11162571@vivo.com
[ rjw: Subject and changelog edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Yang Ruibin authored and Rafael J. Wysocki committed Aug 21, 2024
1 parent 47ac09b commit 57df60e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/thermal/thermal_debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,11 @@ struct thermal_debugfs {
void thermal_debug_init(void)
{
d_root = debugfs_create_dir("thermal", NULL);
if (!d_root)
if (IS_ERR(d_root))
return;

d_cdev = debugfs_create_dir("cooling_devices", d_root);
if (!d_cdev)
if (IS_ERR(d_cdev))
return;

d_tz = debugfs_create_dir("thermal_zones", d_root);
Expand All @@ -202,7 +202,7 @@ static struct thermal_debugfs *thermal_debugfs_add_id(struct dentry *d, int id)
snprintf(ids, IDSLENGTH, "%d", id);

thermal_dbg->d_top = debugfs_create_dir(ids, d);
if (!thermal_dbg->d_top) {
if (IS_ERR(thermal_dbg->d_top)) {
kfree(thermal_dbg);
return NULL;
}
Expand Down

0 comments on commit 57df60e

Please sign in to comment.