Commit e621f266 authored by Zhaolei's avatar Zhaolei Committed by Tony Lindgren

ARM: OMAP: Fix debugfs_create_*'s error checking method for arm/plat-omap

debugfs_create_*() returns NULL if an error occurs, returns -ENODEV
when debugfs is not enabled in the kernel.

Comparing to PATCH v1, because clk_debugfs_init is included in
"#if defined CONFIG_DEBUG_FS", we only need to check NULL return.
Thanks Li Zefan <lizf@cn.fujitsu.com>

debugfs_create_u8() and other function's return value's checking method are
also fixed in this patch.
Signed-off-by: default avatarZhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 85d7a070
...@@ -428,23 +428,23 @@ static int clk_debugfs_register_one(struct clk *c) ...@@ -428,23 +428,23 @@ static int clk_debugfs_register_one(struct clk *c)
if (c->id != 0) if (c->id != 0)
sprintf(p, ":%d", c->id); sprintf(p, ":%d", c->id);
d = debugfs_create_dir(s, pa ? pa->dent : clk_debugfs_root); d = debugfs_create_dir(s, pa ? pa->dent : clk_debugfs_root);
if (IS_ERR(d)) if (!d)
return PTR_ERR(d); return -ENOMEM;
c->dent = d; c->dent = d;
d = debugfs_create_u8("usecount", S_IRUGO, c->dent, (u8 *)&c->usecount); d = debugfs_create_u8("usecount", S_IRUGO, c->dent, (u8 *)&c->usecount);
if (IS_ERR(d)) { if (!d) {
err = PTR_ERR(d); err = -ENOMEM;
goto err_out; goto err_out;
} }
d = debugfs_create_u32("rate", S_IRUGO, c->dent, (u32 *)&c->rate); d = debugfs_create_u32("rate", S_IRUGO, c->dent, (u32 *)&c->rate);
if (IS_ERR(d)) { if (!d) {
err = PTR_ERR(d); err = -ENOMEM;
goto err_out; goto err_out;
} }
d = debugfs_create_x32("flags", S_IRUGO, c->dent, (u32 *)&c->flags); d = debugfs_create_x32("flags", S_IRUGO, c->dent, (u32 *)&c->flags);
if (IS_ERR(d)) { if (!d) {
err = PTR_ERR(d); err = -ENOMEM;
goto err_out; goto err_out;
} }
return 0; return 0;
...@@ -483,8 +483,8 @@ static int __init clk_debugfs_init(void) ...@@ -483,8 +483,8 @@ static int __init clk_debugfs_init(void)
int err; int err;
d = debugfs_create_dir("clock", NULL); d = debugfs_create_dir("clock", NULL);
if (IS_ERR(d)) if (!d)
return PTR_ERR(d); return -ENOMEM;
clk_debugfs_root = d; clk_debugfs_root = d;
list_for_each_entry(c, &clocks, node) { list_for_each_entry(c, &clocks, node) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment