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

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

Merge "msm: ipa3: Fix IPA active clients log error handling at ipa init"

parents 4213e793 c48ba999

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

+4 −1
Original line number Diff line number Diff line
@@ -363,6 +363,8 @@ void ipa2_active_clients_log_clear(void) 
static void ipa2_active_clients_log_destroy(void)

{

	ipa_ctx->ipa2_active_clients_logging.log_rdy = 0;

	kfree(active_clients_table_buf);

	active_clients_table_buf = NULL;

	kfree(ipa_ctx->ipa2_active_clients_logging.log_buffer[0]);

	ipa_ctx->ipa2_active_clients_logging.log_head = 0;

	ipa_ctx->ipa2_active_clients_logging.log_tail =
@@ -3983,7 +3985,8 @@ static int ipa_init(const struct ipa_plat_drv_res *resource_p, 
		IPADBG("Skipping bus scaling registration on Virtual plat\n");

	}



	if (ipa2_active_clients_log_init())

	result = ipa2_active_clients_log_init()

	if (result)

		goto fail_init_active_client;



	/* get IPA clocks */

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

+4 −1
Original line number Diff line number Diff line
@@ -461,6 +461,8 @@ static void ipa3_active_clients_log_destroy(void) 


	spin_lock_irqsave(&ipa3_ctx->ipa3_active_clients_logging.lock, flags);

	ipa3_ctx->ipa3_active_clients_logging.log_rdy = 0;

	kfree(active_clients_table_buf);

	active_clients_table_buf = NULL;

	kfree(ipa3_ctx->ipa3_active_clients_logging.log_buffer[0]);

	ipa3_ctx->ipa3_active_clients_logging.log_head = 0;

	ipa3_ctx->ipa3_active_clients_logging.log_tail =
@@ -4974,7 +4976,8 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p, 
		goto fail_clk;



	/* init active_clients_log after getting ipa-clk */

	if (ipa3_active_clients_log_init())

	result = ipa3_active_clients_log_init();

	if (result)

		goto fail_init_active_client;



	/* Enable ipa3_ctx->enable_clock_scaling */