Previously, the kernel would complain:

| debugfs ppc4xx ocm: failed to create file

But the "info" file was still created and working. This
is because debugfs_create_file() returns a pointer to a
struct *dentry on success or -ENODEV when debugfs isn't
available. This patch fixes both the debugfs_create_dir()
and debugfs_create_file() check, so this will work as
expected.

Signed-off-by: Christian Lamparter <chunk...@gmail.com>
---
 arch/powerpc/platforms/4xx/ocm.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/platforms/4xx/ocm.c b/arch/powerpc/platforms/4xx/ocm.c
index 69d9f60d9fe5..e616c8636303 100644
--- a/arch/powerpc/platforms/4xx/ocm.c
+++ b/arch/powerpc/platforms/4xx/ocm.c
@@ -293,13 +293,14 @@ static int ocm_debugfs_init(void)
 {
        struct dentry *junk;
 
-       junk = debugfs_create_dir("ppc4xx_ocm", 0);
-       if (!junk) {
+       junk = debugfs_create_dir("ppc4xx_ocm", NULL);
+       if (IS_ERR_OR_NULL(junk)) {
                printk(KERN_ALERT "debugfs ppc4xx ocm: failed to create dir\n");
                return -1;
        }
 
-       if (debugfs_create_file("info", 0644, junk, NULL, &ocm_debugfs_fops)) {
+       if (IS_ERR_OR_NULL(debugfs_create_file("info", 0644, junk, NULL,
+                                              &ocm_debugfs_fops))) {
                printk(KERN_ALERT "debugfs ppc4xx ocm: failed to create 
file\n");
                return -1;
        }
-- 
2.19.1

Reply via email to