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

Commit 7e1bac05 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: Error prints are misleading fix it"

parents e69f2db7 0af3c660

drivers/platform/msm/ipa/ipa_v2/ipa.c

+2 −6
Original line number Diff line number Diff line
@@ -3938,11 +3938,8 @@ static int ipa_init(const struct ipa_plat_drv_res *resource_p, 
	}



	ipa_ctx->logbuf = ipc_log_context_create(IPA_IPC_LOG_PAGES, "ipa", 0);

	if (ipa_ctx->logbuf == NULL) {

		IPAERR("failed to get logbuf\n");

		result = -ENOMEM;

		goto fail_logbuf;

	}

	if (ipa_ctx->logbuf == NULL)

		IPADBG("failed to create IPC log, continue...\n");



	ipa_ctx->pdev = ipa_dev;

	ipa_ctx->uc_pdev = ipa_dev;
@@ -4488,7 +4485,6 @@ static int ipa_init(const struct ipa_plat_drv_res *resource_p, 
	kfree(ipa_ctx->ctrl);

fail_mem_ctrl:

	ipc_log_context_destroy(ipa_ctx->logbuf);

fail_logbuf:

	kfree(ipa_ctx);

	ipa_ctx = NULL;

fail_mem_ctx:

drivers/platform/msm/ipa/ipa_v2/ipa_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1903,7 +1903,7 @@ static ssize_t ipa_enable_ipc_low(struct file *file, 
				ipc_log_context_create(IPA_IPC_LOG_PAGES,

				"ipa_low", 0);

			if (ipa_ipc_low_buff == NULL)

				IPAERR("failed to get logbuf_low\n");

				IPADBG("failed to get logbuf_low\n");

		}

		ipa_ctx->logbuf_low = ipa_ipc_low_buff;

	} else {

drivers/platform/msm/ipa/ipa_v3/ipa.c

+1 −1
Original line number Diff line number Diff line
@@ -5018,7 +5018,7 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p, 


	ipa3_ctx->logbuf = ipc_log_context_create(IPA_IPC_LOG_PAGES, "ipa", 0);

	if (ipa3_ctx->logbuf == NULL)

		IPAERR("failed to create IPC log, continue...\n");

		IPADBG("failed to create IPC log, continue...\n");



	/* ipa3_ctx->pdev and ipa3_ctx->uc_pdev will be set in the smmu probes*/

	ipa3_ctx->master_pdev = ipa_pdev;

drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -2089,7 +2089,7 @@ static ssize_t ipa3_enable_ipc_low(struct file *file, 
					"ipa_low", 0);

		}

			if (ipa_ipc_low_buff == NULL)

				IPAERR("failed to get logbuf_low\n");

				IPADBG("failed to get logbuf_low\n");

		ipa3_ctx->logbuf_low = ipa_ipc_low_buff;

	} else {

		ipa3_ctx->logbuf_low = NULL;