Merge "qseecom: fix a common lib loading issue" (83040785) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/misc/qseecom.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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;
		@@ -4298,6 +4297,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");
		@@ -4312,7 +4312,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;
		@@ -4353,7 +4353,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) {
		@@ -4401,7 +4401,7 @@ static int qseecom_load_commonlib_image(struct qseecom_dev_handle *data,
		}

		exit_free_img_data:
		__qseecom_free_img_data(&qseecom.cmnlib_ion_handle);
		__qseecom_free_img_data(&cmnlib_ion_handle);
		return ret;
		}