From ac60116210444852562f2a114a37fbbdc2a1e2a0 Mon Sep 17 00:00:00 2001 From: Prakruthi Deepak Heragu Date: Mon, 13 Apr 2020 16:08:54 -0700 Subject: [PATCH] msm: cvp: Fix NULL pointer error when DEBUG_FS is disabled Add extra check to avoid NULL pointer derefernce when DEBUG_FS is disabled. Change-Id: I84f4385b91250ea6a200ff36c679f448229da6c6 Signed-off-by: Prakruthi Deepak Heragu --- drivers/media/platform/msm/cvp/msm_cvp_debug.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/msm/cvp/msm_cvp_debug.c b/drivers/media/platform/msm/cvp/msm_cvp_debug.c index cf3f44516f30..612f9888fd8e 100644 --- a/drivers/media/platform/msm/cvp/msm_cvp_debug.c +++ b/drivers/media/platform/msm/cvp/msm_cvp_debug.c @@ -349,7 +349,8 @@ struct dentry *msm_cvp_debugfs_init_core(struct msm_cvp_core *core, snprintf(debugfs_name, MAX_DEBUGFS_NAME, "core%d", core->id); dir = debugfs_create_dir(debugfs_name, parent); - if (!dir) { + if (IS_ERR_OR_NULL(dir)) { + dir = NULL; dprintk(CVP_ERR, "Failed to create debugfs for msm_cvp\n"); goto failed_create_dir; } @@ -495,7 +496,8 @@ struct dentry *msm_cvp_debugfs_init_inst(struct msm_cvp_inst *inst, idata->inst = inst; dir = debugfs_create_dir(debugfs_name, parent); - if (!dir) { + if (IS_ERR_OR_NULL(dir)) { + dir = NULL; dprintk(CVP_ERR, "Failed to create debugfs for msm_cvp\n"); goto failed_create_dir; }