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

Commit b9dcf7b5 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: Fix wrong usage and cleanup code"

parents 0fda0080 30a7426f

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

+1 −2
Original line number Diff line number Diff line
@@ -649,7 +649,6 @@ static int __ipa_add_hdr_proc_ctx(struct ipa_hdr_proc_ctx_add *proc_ctx, 
	return 0;



ipa_insert_failed:

	if (offset)

	list_move(&offset->link,

		&htbl->head_free_offset_list[offset->bin]);

	entry->offset_entry = NULL;

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

+1 −1
Original line number Diff line number Diff line
@@ -1399,7 +1399,7 @@ int ipa2_put_rt_tbl(u32 rt_tbl_hdl) 
{

	struct ipa_rt_tbl *entry;

	enum ipa_ip_type ip = IPA_IP_MAX;

	int result;

	int result = 0;



	mutex_lock(&ipa_ctx->lock);

	entry = ipa_id_find(rt_tbl_hdl);

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

+1 −2
Original line number Diff line number Diff line
@@ -440,7 +440,6 @@ static int __ipa_add_hdr_proc_ctx(struct ipa_hdr_proc_ctx_add *proc_ctx, 
	return 0;



ipa_insert_failed:

	if (offset)

	list_move(&offset->link,

		&htbl->head_free_offset_list[offset->bin]);

	entry->offset_entry = NULL;

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

+2 −1
Original line number Diff line number Diff line
@@ -1709,7 +1709,7 @@ int ipa3_put_rt_tbl(u32 rt_tbl_hdl) 
{

	struct ipa3_rt_tbl *entry;

	enum ipa_ip_type ip = IPA_IP_MAX;

	int result;

	int result = 0;



	mutex_lock(&ipa3_ctx->lock);

	entry = ipa3_id_find(rt_tbl_hdl);
@@ -1731,6 +1731,7 @@ int ipa3_put_rt_tbl(u32 rt_tbl_hdl) 
		ip = IPA_IP_v6;

	else {

		WARN_ON(1);

		result = -EINVAL;

		goto ret;

	}