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 21:59:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge f2729f4a13 on remote branch

Browse source 
Change-Id: Ie46f75396403dd65a5a50665736782589a7d6bcd
This commit is contained in:
Linux Build Service Account 2022-05-10 06:41:08 -07:00
commit ba8501751d
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7947,8 +7947,10 @@ fail_mem_ctrl:
kfree(ipa3_ctx->ipa_tz_unlock_reg);
ipa3_ctx->ipa_tz_unlock_reg = NULL;
fail_tz_unlock_reg:
if (ipa3_ctx->logbuf)
if (ipa3_ctx->logbuf) {
ipc_log_context_destroy(ipa3_ctx->logbuf);
ipa3_ctx->logbuf = NULL;
}
fail_uc_file_alloc:
kfree(ipa3_ctx->gsi_fw_file_name);
ipa3_ctx->gsi_fw_file_name = NULL;

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

@ -27,7 +27,7 @@
#define IPA_Q6_SERVICE_INS_ID 2
#define QMI_SEND_STATS_REQ_TIMEOUT_MS 5000
#define QMI_SEND_REQ_TIMEOUT_MS 60000
#define QMI_SEND_REQ_TIMEOUT_MS 10000
#define QMI_MHI_SEND_REQ_TIMEOUT_MS 1000
#define QMI_IPA_FORCE_CLEAR_DATAPATH_TIMEOUT_MS 1000
@ -467,14 +467,22 @@ static int ipa3_qmi_send_req_wait(struct qmi_handle *client_handle,
struct qmi_txn txn;
int ret;
mutex_lock(&ipa3_qmi_lock);
if (!client_handle) {
mutex_unlock(&ipa3_qmi_lock);
return -EINVAL;
}
ret = qmi_txn_init(client_handle, &txn, resp_desc->ei_array, resp);
if (ret < 0) {
IPAWANERR("QMI txn init failed, ret= %d\n", ret);
mutex_unlock(&ipa3_qmi_lock);
return ret;
}
mutex_lock(&ipa3_qmi_lock);
ret = qmi_send_request(client_handle,
&ipa3_qmi_ctx->server_sq,
&txn,
@ -483,19 +491,16 @@ static int ipa3_qmi_send_req_wait(struct qmi_handle *client_handle,
req_desc->ei_array,
req);
if (unlikely(!ipa_q6_clnt)) {
mutex_unlock(&ipa3_qmi_lock);
return -EINVAL;
}
mutex_unlock(&ipa3_qmi_lock);
if (ret < 0) {
qmi_txn_cancel(&txn);
mutex_unlock(&ipa3_qmi_lock);
return ret;
}
ret = qmi_txn_wait(&txn, msecs_to_jiffies(timeout_ms));
ret = qmi_txn_wait(&txn, msecs_to_jiffies(timeout_ms));
mutex_unlock(&ipa3_qmi_lock);
return ret;
}