diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2014-07-30 08:53:41 +0800 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2014-07-31 00:20:33 +0200 |
| commit | 3fd276e9c0d75538c3b5ed96d0ce36d227fdca95 (patch) | |
| tree | e50ce59ee321d3a7ab997cc75f8c8a84520b1908 /drivers/hsi | |
| parent | c2acb7c4d566a1735e255acc7260e1dec6b9a7c8 (diff) | |
| download | linux-3fd276e9c0d75538c3b5ed96d0ce36d227fdca95.tar.gz linux-3fd276e9c0d75538c3b5ed96d0ce36d227fdca95.tar.bz2 linux-3fd276e9c0d75538c3b5ed96d0ce36d227fdca95.zip | |
HSI: omap_ssi: Fix return value check in ssi_debug_add_ctrl()
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>
Diffstat (limited to 'drivers/hsi')
| -rw-r--r-- | drivers/hsi/controllers/omap_ssi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hsi/controllers/omap_ssi.c b/drivers/hsi/controllers/omap_ssi.c index 232ab7340b76..bf0eace4cb67 100644 --- a/drivers/hsi/controllers/omap_ssi.c +++ b/drivers/hsi/controllers/omap_ssi.c @@ -148,14 +148,14 @@ static int __init ssi_debug_add_ctrl(struct hsi_controller *ssi) /* SSI controller */ omap_ssi->dir = debugfs_create_dir(dev_name(&ssi->device), NULL); - if (IS_ERR(omap_ssi->dir)) - return PTR_ERR(omap_ssi->dir); + if (!omap_ssi->dir) + return -ENOMEM; debugfs_create_file("regs", S_IRUGO, omap_ssi->dir, ssi, &ssi_regs_fops); /* SSI GDD (DMA) */ dir = debugfs_create_dir("gdd", omap_ssi->dir); - if (IS_ERR(dir)) + if (!dir) goto rback; debugfs_create_file("regs", S_IRUGO, dir, ssi, &ssi_gdd_regs_fops); @@ -163,7 +163,7 @@ static int __init ssi_debug_add_ctrl(struct hsi_controller *ssi) rback: debugfs_remove_recursive(omap_ssi->dir); - return PTR_ERR(dir); + return -ENOMEM; } static void ssi_debug_remove_ctrl(struct hsi_controller *ssi) |