2008-10-17 09:23:04

by Zhao Lei

Subject: [PATCH] Fix debugfs_create_file's error checking method for arm/mach-ns9xxx

Hi,

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

Signed-off-by: Zhao Lei <[email protected]>
---
arch/arm/mach-ns9xxx/clock.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-ns9xxx/clock.c b/arch/arm/mach-ns9xxx/clock.c
index 44ed20d..15945e9 100644
--- a/arch/arm/mach-ns9xxx/clock.c
+++ b/arch/arm/mach-ns9xxx/clock.c
@@ -208,7 +208,11 @@ static int __init clk_debugfs_init(void)

dentry = debugfs_create_file("clk", S_IFREG | S_IRUGO, NULL, NULL,
&clk_debugfs_operations);
- return IS_ERR(dentry) ? PTR_ERR(dentry) : 0;
+ if (!dentry)
+ return -ENOMEM;
+ if (IS_ERR(dentry))
+ return PTR_ERR(dentry);
+ return 0;
}
subsys_initcall(clk_debugfs_init);

--
1.5.5.3

2008-10-17 10:01:32

by Zhao Lei

Subject: [PATCH v2] Fix debugfs_create_file's error checking method for arm/mach-ns9xxx

debugfs_create_file() 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 <[email protected]>

Signed-off-by: Zhao Lei <[email protected]>
---
arch/arm/mach-ns9xxx/clock.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-ns9xxx/clock.c b/arch/arm/mach-ns9xxx/clock.c
index 44ed20d..f2dba83 100644
--- a/arch/arm/mach-ns9xxx/clock.c
+++ b/arch/arm/mach-ns9xxx/clock.c
@@ -208,7 +208,9 @@ static int __init clk_debugfs_init(void)

dentry = debugfs_create_file("clk", S_IFREG | S_IRUGO, NULL, NULL,
&clk_debugfs_operations);
- return IS_ERR(dentry) ? PTR_ERR(dentry) : 0;
+ if (!dentry)
+ return -ENOMEM;
+ return 0;
}
subsys_initcall(clk_debugfs_init);

--
1.5.5.3