diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-24 10:52:18 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-24 10:52:18 +0000 |
| commit | d808aa69a7e85dea850ffe7b3d076be696da35be (patch) | |
| tree | 312cd0c2676c14a97f67f020cce0ddf5fbd1d84d /arch/arm/mach-omap2/pm-debug.c | |
| parent | 23cbd4e84f98b36c91d19990760207112f142c5b (diff) | |
| download | olio-linux-3.10-d808aa69a7e85dea850ffe7b3d076be696da35be.tar.xz olio-linux-3.10-d808aa69a7e85dea850ffe7b3d076be696da35be.zip | |
ARM: cleanup: debugfs error handling
Debugfs functions return NULL when they fail, or an error pointer
when not configured. The intention behind the error pointer is that
it appears as a valid pointer to the caller, and so the caller
continues inspite of debugfs not being available.
Debugfs failure should only ever be checked with (!ptr) and not the
IS_ERR*() functions.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2/pm-debug.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm-debug.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c index e2c291f52f9..548547e1479 100644 --- a/arch/arm/mach-omap2/pm-debug.c +++ b/arch/arm/mach-omap2/pm-debug.c @@ -219,7 +219,7 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *dir) return 0; d = debugfs_create_dir(pwrdm->name, (struct dentry *)dir); - if (!(IS_ERR_OR_NULL(d))) + if (d) (void) debugfs_create_file("suspend", S_IRUGO|S_IWUSR, d, (void *)pwrdm, &pwrdm_suspend_fops); @@ -263,8 +263,8 @@ static int __init pm_dbg_init(void) return 0; d = debugfs_create_dir("pm_debug", NULL); - if (IS_ERR_OR_NULL(d)) - return PTR_ERR(d); + if (!d) + return -EINVAL; (void) debugfs_create_file("count", S_IRUGO, d, (void *)DEBUG_FILE_COUNTERS, &debug_fops); |