summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2014-07-30 08:53:20 +0800
committerSebastian Reichel <sre@kernel.org>2014-07-31 00:20:21 +0200
commitc2acb7c4d566a1735e255acc7260e1dec6b9a7c8 (patch)
treee71cd8ac77f44295e2ae5c49d814e26b0072111d
parent0a0ea07d3dff0918484f01c576f098dd4911b1af (diff)
downloadop-kernel-dev-c2acb7c4d566a1735e255acc7260e1dec6b9a7c8.zip
op-kernel-dev-c2acb7c4d566a1735e255acc7260e1dec6b9a7c8.tar.gz
HSI: omap_ssi_port: Fix return value check in ssi_debug_add_port()
In case of error, the function debugfs_create_*() returns NULL pointer not ERR_PTR() if debugfs is enabled. The IS_ERR() test in the return value check should be replaced with NULL test. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Sebastian Reichel <sre@kernel.org>
-rw-r--r--drivers/hsi/controllers/omap_ssi_port.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hsi/controllers/omap_ssi_port.c b/drivers/hsi/controllers/omap_ssi_port.c
index 001b8682..4c0b582 100644
--- a/drivers/hsi/controllers/omap_ssi_port.c
+++ b/drivers/hsi/controllers/omap_ssi_port.c
@@ -177,13 +177,13 @@ static int __init ssi_debug_add_port(struct omap_ssi_port *omap_port,
struct hsi_port *port = to_hsi_port(omap_port->dev);
dir = debugfs_create_dir(dev_name(omap_port->dev), dir);
- if (IS_ERR(dir))
- return PTR_ERR(dir);
+ if (!dir)
+ return -ENOMEM;
omap_port->dir = dir;
debugfs_create_file("regs", S_IRUGO, dir, port, &ssi_port_regs_fops);
dir = debugfs_create_dir("sst", dir);
- if (IS_ERR(dir))
- return PTR_ERR(dir);
+ if (!dir)
+ return -ENOMEM;
debugfs_create_file("divisor", S_IRUGO | S_IWUSR, dir, port,
&ssi_sst_div_fops);
OpenPOWER on IntegriCloud