diff options
author | Jean Pihet <jean.pihet@newoldbits.com> | 2012-02-01 03:37:31 -0500 |
---|---|---|
committer | Kevin Hilman <khilman@ti.com> | 2012-03-05 18:38:02 -0500 |
commit | 401606fd708885d28ce3c14a2a8fe612f8a6b50f (patch) | |
tree | c29ad66364c171fc02648914e550484a5dd67efb /arch | |
parent | 92206fd292da7632c039f6c4054bdaac08b030c0 (diff) |
ARM: OMAP2+: PM debug: fix the use of debugfs_create_* API
Check the return code pointer value from debugfs_create_dir for error
or NULL.
Also added an additional check to prevent the creation of a 'suspend'
entry at the debugfs root in case a power domain directory cannot be
created.
Signed-off-by: Jean Pihet <j-pihet@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch')
-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 4411163e012d..814bcd901596 100644 --- a/arch/arm/mach-omap2/pm-debug.c +++ b/arch/arm/mach-omap2/pm-debug.c | |||
@@ -220,8 +220,8 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *dir) | |||
220 | return 0; | 220 | return 0; |
221 | 221 | ||
222 | d = debugfs_create_dir(pwrdm->name, (struct dentry *)dir); | 222 | d = debugfs_create_dir(pwrdm->name, (struct dentry *)dir); |
223 | 223 | if (!(IS_ERR_OR_NULL(d))) | |
224 | (void) debugfs_create_file("suspend", S_IRUGO|S_IWUSR, d, | 224 | (void) debugfs_create_file("suspend", S_IRUGO|S_IWUSR, d, |
225 | (void *)pwrdm, &pwrdm_suspend_fops); | 225 | (void *)pwrdm, &pwrdm_suspend_fops); |
226 | 226 | ||
227 | return 0; | 227 | return 0; |
@@ -264,7 +264,7 @@ static int __init pm_dbg_init(void) | |||
264 | return 0; | 264 | return 0; |
265 | 265 | ||
266 | d = debugfs_create_dir("pm_debug", NULL); | 266 | d = debugfs_create_dir("pm_debug", NULL); |
267 | if (IS_ERR(d)) | 267 | if (IS_ERR_OR_NULL(d)) |
268 | return PTR_ERR(d); | 268 | return PTR_ERR(d); |
269 | 269 | ||
270 | (void) debugfs_create_file("count", S_IRUGO, | 270 | (void) debugfs_create_file("count", S_IRUGO, |