aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2014-07-29 20:53:41 -0400
committerSebastian Reichel <sre@kernel.org>2014-07-30 18:20:33 -0400
commit3fd276e9c0d75538c3b5ed96d0ce36d227fdca95 (patch)
treee50ce59ee321d3a7ab997cc75f8c8a84520b1908
parentc2acb7c4d566a1735e255acc7260e1dec6b9a7c8 (diff)
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>
-rw-r--r--drivers/hsi/controllers/omap_ssi.c8
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)
148 148
149 /* SSI controller */ 149 /* SSI controller */
150 omap_ssi->dir = debugfs_create_dir(dev_name(&ssi->device), NULL); 150 omap_ssi->dir = debugfs_create_dir(dev_name(&ssi->device), NULL);
151 if (IS_ERR(omap_ssi->dir)) 151 if (!omap_ssi->dir)
152 return PTR_ERR(omap_ssi->dir); 152 return -ENOMEM;
153 153
154 debugfs_create_file("regs", S_IRUGO, omap_ssi->dir, ssi, 154 debugfs_create_file("regs", S_IRUGO, omap_ssi->dir, ssi,
155 &ssi_regs_fops); 155 &ssi_regs_fops);
156 /* SSI GDD (DMA) */ 156 /* SSI GDD (DMA) */
157 dir = debugfs_create_dir("gdd", omap_ssi->dir); 157 dir = debugfs_create_dir("gdd", omap_ssi->dir);
158 if (IS_ERR(dir)) 158 if (!dir)
159 goto rback; 159 goto rback;
160 debugfs_create_file("regs", S_IRUGO, dir, ssi, &ssi_gdd_regs_fops); 160 debugfs_create_file("regs", S_IRUGO, dir, ssi, &ssi_gdd_regs_fops);
161 161
@@ -163,7 +163,7 @@ static int __init ssi_debug_add_ctrl(struct hsi_controller *ssi)
163rback: 163rback:
164 debugfs_remove_recursive(omap_ssi->dir); 164 debugfs_remove_recursive(omap_ssi->dir);
165 165
166 return PTR_ERR(dir); 166 return -ENOMEM;
167} 167}
168 168
169static void ssi_debug_remove_ctrl(struct hsi_controller *ssi) 169static void ssi_debug_remove_ctrl(struct hsi_controller *ssi)