Merge "drm/msm/dp: fix the return value of DP debug module during bind" (7a5519a6) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/drm/msm/dp/dp_debug.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -666,6 +666,9 @@ static int dp_debug_init(struct dp_debug *dp_debug)

		dir = debugfs_create_dir(DEBUG_NAME, NULL);
		if (IS_ERR_OR_NULL(dir)) {
		if (!dir)
		rc = -EINVAL;
		else
		rc = PTR_ERR(dir);
		pr_err("[%s] debugfs create dir failed, rc = %d\n",
		DEBUG_NAME, rc);
		@@ -749,6 +752,8 @@ static int dp_debug_init(struct dp_debug *dp_debug)
		return 0;

		error_remove_dir:
		if (!file)
		rc = -EINVAL;
		debugfs_remove_recursive(dir);
		error:
		return rc;