Merge "qseecom: don't release ion share memory if scm_call unload TA failed" (e3ea6c56) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/misc/qseecom.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -2151,7 +2151,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 unload_exit;
		goto not_release_exit;
		} else {
		pr_warn("App id %d now unloaded\n", req.app_id);
		}
		@@ -2159,7 +2159,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 unload_exit;
		goto not_release_exit;
		}
		if (resp.result == QSEOS_RESULT_SUCCESS)
		pr_debug("App (%d) is unloaded!!\n",
		@@ -2170,7 +2170,7 @@ static int qseecom_unload_app(struct qseecom_dev_handle *data,
		if (ret) {
		pr_err("process_incomplete_cmd fail err: %d\n",
		ret);
		goto unload_exit;
		goto not_release_exit;
		}
		}
		}
		@@ -2200,6 +2200,7 @@ 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;
		}