Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c3d768a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 8e57ec12 ac601162

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

+4 −2
Original line number Diff line number Diff line
@@ -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;

	}