A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 05:39:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge f0f97b4005 on remote branch

Browse source 
Change-Id: I5ce67e3f1f1b91671b8fa88e2f527976ded39617
This commit is contained in:
Linux Build Service Account 2022-07-12 16:01:24 -07:00
commit ad5ac8083f
4 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/platform/msm/ipa/ipa_rm_peers_list.c
View file

@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved
*/
#include <linux/slab.h>
@ -68,6 +69,7 @@ int ipa_rm_peers_list_create(int max_peers,
list_alloc_fail:
kfree(*peers_list);
*peers_list = NULL;
bail:
return result;
}

6
drivers/platform/msm/ipa/ipa_v3/ipa_odl.c
View file

@ -473,6 +473,12 @@ void ipa3_odl_pipe_cleanup(bool is_ssr)
IPAERR("adpl pipe not configured\n");
return;
}
if(!ipa3_odl_ctx->odl_state.odl_ep_setup) {
IPAERR("adpl pipe setup not done\n");
return;
}
if (ipa3_odl_ctx->odl_state.odl_open)
ipa_odl_opened = true;

6
drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.c
View file

@ -469,8 +469,8 @@ static int ipa3_qmi_send_req_wait(struct qmi_handle *client_handle,
mutex_lock(&ipa3_qmi_lock);
if (!client_handle) {
if (client_handle != ipa_q6_clnt) {
IPADBG("Q6 QMI clinet pointer already freed\n");
mutex_unlock(&ipa3_qmi_lock);
return -EINVAL;
}
@ -1857,6 +1857,7 @@ void ipa3_qmi_service_exit(void)
workqueues_stopped = true;
IPADBG("Entry\n");
/* qmi-service */
if (ipa3_svc_handle != NULL) {
qmi_handle_release(ipa3_svc_handle);
@ -1889,6 +1890,7 @@ void ipa3_qmi_service_exit(void)
ipa3_qmi_indication_fin = false;
ipa3_modem_init_cmplt = false;
send_qmi_init_q6 = true;
IPADBG("Exit\n");
}
void ipa3_qmi_stop_workqueues(void)

4
drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_fltrt.c
View file

@ -3532,12 +3532,12 @@ int ipahal_fltrt_init(enum ipa_hw_type ipa_hw_type)
if (!IPA_IS_RULE_EQ_VALID(i))
continue;
if (eq_bits & IPA_GET_RULE_EQ_BIT_PTRN(eq_bitfield[i])) {
if (eq_bits & IPA_GET_RULE_EQ_BIT_PTRN(i)) {
IPAHAL_ERR("more than eq with same bit. eq=%d\n", i);
WARN_ON(1);
return -EFAULT;
}
eq_bits |= IPA_GET_RULE_EQ_BIT_PTRN(eq_bitfield[i]);
eq_bits |= IPA_GET_RULE_EQ_BIT_PTRN(i);
}
mem = &ipahal_ctx->empty_fltrt_tbl;