Merge "qseecom: Fix ion memory issue during unload app failure" (2705efa5) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/misc/qseecom.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -2215,7 +2215,7 @@ static int qseecom_unload_app(struct qseecom_dev_handle *data,

		if (!memcmp(data->client.app_name, "keymaste", strlen("keymaste"))) {
		pr_debug("Do not unload keymaster app from tz\n");
		return 0;
		goto unload_exit;
		}

		__qseecom_cleanup_app(data);
		@@ -2267,7 +2267,7 @@ static int qseecom_unload_app(struct qseecom_dev_handle *data,
		pr_err("scm_call to unload app (id = %d) failed\n",
		req.app_id);
		ret = -EFAULT;
		goto not_release_exit;
		goto unload_exit;
		} else {
		pr_warn("App id %d now unloaded\n", req.app_id);
		}
		@@ -2275,7 +2275,7 @@ static int qseecom_unload_app(struct qseecom_dev_handle *data,
		pr_err("app (%d) unload_failed!!\n",
		data->client.app_id);
		ret = -EFAULT;
		goto not_release_exit;
		goto unload_exit;
		}
		if (resp.result == QSEOS_RESULT_SUCCESS)
		pr_debug("App (%d) is unloaded!!\n",
		@@ -2285,7 +2285,7 @@ static int qseecom_unload_app(struct qseecom_dev_handle *data,
		if (ret) {
		pr_err("process_incomplete_cmd fail err: %d\n",
		ret);
		goto not_release_exit;
		goto unload_exit;
		}
		}
		}
		@@ -2315,7 +2315,6 @@ static int qseecom_unload_app(struct qseecom_dev_handle *data,
		unload_exit:
		qseecom_unmap_ion_allocated_memory(data);
		data->released = true;
		not_release_exit:
		return ret;
		}