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

Commit 2842372b 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: freeing null pointer causing device crash"

parents 5032d0b7 d429fb06

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

+7 −5
Original line number Diff line number Diff line
@@ -725,12 +725,14 @@ void ipa_nat_free_mem_and_device(struct ipa_nat_mem *nat_ctx) 


	if (nat_ctx->is_sys_mem) {

		IPADBG("freeing the dma memory\n");

		if (nat_ctx->vaddr) {

			dma_free_coherent(

				ipa_ctx->pdev, nat_ctx->size,

				nat_ctx->vaddr, nat_ctx->dma_handle);

			nat_ctx->size = 0;

			nat_ctx->vaddr = NULL;

		}

	}

	nat_ctx->is_mapped = false;

	nat_ctx->is_sys_mem = false;

	nat_ctx->is_dev_init = false;

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

+7 −5
Original line number Diff line number Diff line
@@ -747,12 +747,14 @@ void ipa3_nat_free_mem_and_device(struct ipa3_nat_mem *nat_ctx) 


	if (nat_ctx->is_sys_mem) {

		IPADBG("freeing the dma memory\n");

		if (nat_ctx->vaddr) {

			dma_free_coherent(

				ipa3_ctx->pdev, nat_ctx->size,

				nat_ctx->vaddr, nat_ctx->dma_handle);

			nat_ctx->size = 0;

			nat_ctx->vaddr = NULL;

		}

	}

	nat_ctx->is_mapped = false;

	nat_ctx->is_sys_mem = false;

	nat_ctx->is_dev_init = false;