diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-12-03 09:32:20 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-12-03 09:32:19 -0800 |
| commit | 96081867a4995112d65750656b2d1fe779a1f5c6 (patch) | |
| tree | b68dfaa5a531f4f38c4940a2f4b60173ed40581f | |
| parent | db3336d536d7eb6c687333d6b10ce61f4a99955a (diff) | |
| parent | 6fadad98bf2467bc0f970ec79fe38c3b5e1d5379 (diff) | |
Merge "qseecom: fix a common lib loading issue"
| -rw-r--r-- | drivers/misc/qseecom.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/qseecom.c b/drivers/misc/qseecom.c index dd96d228e9e1..128eb0cce85b 100644 --- a/drivers/misc/qseecom.c +++ b/drivers/misc/qseecom.c @@ -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; } |