提交 44216827 编写于 作者: S Sudip Mukherjee 提交者: Boris Brezillon

mtd: nand: nandsim: fix error check

debugfs_create_dir() and debugfs_create_file() returns NULL on error or
a pointer on success. They do not return the error value with ERR_PTR.
So we should not check the return with IS_ERR_OR_NULL, instead we
should just check for NULL.
Signed-off-by: NSudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: NBoris Brezillon <boris.brezillon@free-electrons.com>
上级 37871abd
...@@ -525,24 +525,20 @@ static int nandsim_debugfs_create(struct nandsim *dev) ...@@ -525,24 +525,20 @@ static int nandsim_debugfs_create(struct nandsim *dev)
{ {
struct nandsim_debug_info *dbg = &dev->dbg; struct nandsim_debug_info *dbg = &dev->dbg;
struct dentry *dent; struct dentry *dent;
int err;
if (!IS_ENABLED(CONFIG_DEBUG_FS)) if (!IS_ENABLED(CONFIG_DEBUG_FS))
return 0; return 0;
dent = debugfs_create_dir("nandsim", NULL); dent = debugfs_create_dir("nandsim", NULL);
if (IS_ERR_OR_NULL(dent)) { if (!dent) {
int err = dent ? -ENODEV : PTR_ERR(dent); NS_ERR("cannot create \"nandsim\" debugfs directory\n");
return -ENODEV;
NS_ERR("cannot create \"nandsim\" debugfs directory, err %d\n",
err);
return err;
} }
dbg->dfs_root = dent; dbg->dfs_root = dent;
dent = debugfs_create_file("wear_report", S_IRUSR, dent = debugfs_create_file("wear_report", S_IRUSR,
dbg->dfs_root, dev, &dfs_fops); dbg->dfs_root, dev, &dfs_fops);
if (IS_ERR_OR_NULL(dent)) if (!dent)
goto out_remove; goto out_remove;
dbg->dfs_wear_report = dent; dbg->dfs_wear_report = dent;
...@@ -550,8 +546,7 @@ static int nandsim_debugfs_create(struct nandsim *dev) ...@@ -550,8 +546,7 @@ static int nandsim_debugfs_create(struct nandsim *dev)
out_remove: out_remove:
debugfs_remove_recursive(dbg->dfs_root); debugfs_remove_recursive(dbg->dfs_root);
err = dent ? PTR_ERR(dent) : -ENODEV; return -ENODEV;
return err;
} }
/** /**
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册