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

Commit 66f971f3 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: continue probe on ipc log failure"

parents f7923875 ad7c98a1

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

+4 −7
Original line number Diff line number Diff line
@@ -3848,11 +3848,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)

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



	ipa_ctx->pdev = ipa_dev;

	ipa_ctx->uc_pdev = ipa_dev;
@@ -4390,8 +4387,8 @@ fail_bus_reg: 
fail_bind:

	kfree(ipa_ctx->ctrl);

fail_mem_ctrl:

	if (ipa_ctx->logbuf)

		ipc_log_context_destroy(ipa_ctx->logbuf);

fail_logbuf:

	kfree(ipa_ctx);

	ipa_ctx = NULL;

fail_mem_ctx:

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

+4 −7
Original line number Diff line number Diff line
@@ -4264,11 +4264,8 @@ 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 get logbuf\n");

		result = -ENOMEM;

		goto fail_logbuf;

	}

	if (ipa3_ctx->logbuf == NULL)

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



	ipa3_ctx->pdev = ipa_dev;

	ipa3_ctx->uc_pdev = ipa_dev;
@@ -4769,8 +4766,8 @@ fail_bind: 
fail_mem_ctrl:

	kfree(ipa3_ctx->ipa_tz_unlock_reg);

fail_tz_unlock_reg:

	if (ipa3_ctx->logbuf)

		ipc_log_context_destroy(ipa3_ctx->logbuf);

fail_logbuf:

	kfree(ipa3_ctx);

	ipa3_ctx = NULL;

fail_mem_ctx: