evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: ipa: Fix wrong usage and cleanup code"

Browse source
This commit is contained in:
Linux Build Service Account 2017-08-03 20:51:04 -07:00 • committed by Gerrit - the friendly Code Review server
commit aca4631c48
4 changed files with 5 additions and 6 deletions
drivers/platform/msm/ipa
ipa_v2
ipa_hdr.cipa_rt.c
ipa_v3
ipa_hdr.cipa_rt.c

3
drivers/platform/msm/ipa/ipa_v2/ipa_hdr.c
View file

@ -649,8 +649,7 @@ 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,
list_move(&offset->link,
&htbl->head_free_offset_list[offset->bin]);
entry->offset_entry = NULL;
list_del(&entry->link);

2
drivers/platform/msm/ipa/ipa_v2/ipa_rt.c
View file

@ -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);

3
drivers/platform/msm/ipa/ipa_v3/ipa_hdr.c
View file

@ -426,8 +426,7 @@ 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,
list_move(&offset->link,
&htbl->head_free_offset_list[offset->bin]);
entry->offset_entry = NULL;
list_del(&entry->link);

3
drivers/platform/msm/ipa/ipa_v3/ipa_rt.c
View file

@ -1479,7 +1479,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);
@ -1501,6 +1501,7 @@ int ipa3_put_rt_tbl(u32 rt_tbl_hdl)
ip = IPA_IP_v6;
else {
WARN_ON(1);
result = -EINVAL;
goto ret;
}