Merge "msm: vidc: Fix NULL pointer error when DEBUG_FS is disabled"

This commit is contained in:
qctecmdr 2020-04-30 22:22:03 -07:00 • committed by Gerrit - the friendly Code Review server
commit 5d2ebfcdfb

View file

@ -270,7 +270,8 @@ struct dentry *msm_vidc_debugfs_init_core(struct msm_vidc_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;
d_vpr_e("Failed to create debugfs for msm_vidc\n");
goto failed_create_dir;
}
@ -491,6 +492,7 @@ struct dentry *msm_vidc_debugfs_init_inst(struct msm_vidc_inst *inst,
dir = debugfs_create_dir(debugfs_name, parent);
if (IS_ERR_OR_NULL(dir)) {
dir = NULL;
s_vpr_e(inst->sid, "Failed to create debugfs for msm_vidc\n");
goto failed_create_dir;
}