commit 65bc2df6eac6080672c2fb740229093324792f69
author Linux Build Service Account <lnxbuild@localhost> Wed Oct 22 22:37:40 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Oct 22 22:37:40 2014 -0700
tree 79ea3c6922eeab44386b435ca33218c4e2bf4517
parent 0b5250d7bad133ab77328ee50244e82702c44783
parent d83bdcb036fab428c28b5d1432b9d5a1c9d4e35a

Merge "qseecom: fix secure app loading failure by kernel mode qseecom client"

drivers/misc/qseecom.c

diff --git a/drivers/misc/qseecom.c b/drivers/misc/qseecom.c
index 9c55330..3a93469 100644
--- a/drivers/misc/qseecom.c
+++ b/drivers/misc/qseecom.c
@@ -1904,7 +1904,6 @@
 
 	ret = __qseecom_enable_clk_scale_up(data);
 	if (ret) {
-		kzfree(img_data);
 		ret = -EIO;
 		goto loadfw_err;
 	}
@@ -1914,7 +1913,6 @@
 	ret = scm_call(SCM_SVC_TZSCHEDULER, 1,	&load_req,
 			sizeof(struct qseecom_load_app_ireq),
 			&resp, sizeof(resp));
-	kzfree(img_data);
 	if (ret) {
 		pr_err("scm_call to load failed : ret %d\n", ret);
 		ret = -EIO;
@@ -1942,6 +1940,7 @@
 	}
 
 loadfw_err:
+	kzfree(img_data);
 	__qseecom_disable_clk_scale_down(data);
 	if (qseecom.support_bus_scaling) {
 		mutex_lock(&qsee_bw_mutex);