Merge "msm: cvp: Fix NULL pointer error when DEBUG_FS is disabled" (6c723d9e) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/media/platform/msm/cvp/msm_cvp_debug.c

+5 −3

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
		*/

		#define CREATE_TRACE_POINTS
		@@ -277,7 +277,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;
		}
		@@ -423,7 +424,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;
		}