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

Merge "qseecom: fix a common lib loading issue"

Browse source
This commit is contained in:
Linux Build Service Account 2017-12-03 09:32:20 -08:00 • committed by Gerrit - the friendly Code Review server
commit 96081867a4
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/misc/qseecom.c
View file

@ -252,7 +252,6 @@ struct qseecom_control {
bool whitelist_support;
bool commonlib_loaded;
bool commonlib64_loaded;
struct ion_handle *cmnlib_ion_handle;
struct ce_hw_usage_info ce_info;
int qsee_bw_count;
@ -4293,6 +4292,7 @@ static int qseecom_load_commonlib_image(struct qseecom_dev_handle *data,
void *cmd_buf = NULL;
size_t cmd_len;
uint32_t app_arch = 0;
struct ion_handle *cmnlib_ion_handle = NULL;
if (!cmnlib_name) {
pr_err("cmnlib_name is NULL\n");
@ -4307,7 +4307,7 @@ static int qseecom_load_commonlib_image(struct qseecom_dev_handle *data,
if (__qseecom_get_fw_size(cmnlib_name, &fw_size, &app_arch))
return -EIO;
ret = __qseecom_allocate_img_data(&qseecom.cmnlib_ion_handle,
ret = __qseecom_allocate_img_data(&cmnlib_ion_handle,
&img_data, fw_size, &pa);
if (ret)
return -EIO;
@ -4348,7 +4348,7 @@ static int qseecom_load_commonlib_image(struct qseecom_dev_handle *data,
goto exit_unregister_bus_bw_need;
}
ret = msm_ion_do_cache_op(qseecom.ion_clnt, qseecom.cmnlib_ion_handle,
ret = msm_ion_do_cache_op(qseecom.ion_clnt, cmnlib_ion_handle,
img_data, fw_size,
ION_IOC_CLEAN_INV_CACHES);
if (ret) {
@ -4396,7 +4396,7 @@ exit_unregister_bus_bw_need:
}
exit_free_img_data:
__qseecom_free_img_data(&qseecom.cmnlib_ion_handle);
__qseecom_free_img_data(&cmnlib_ion_handle);
return ret;
}