Merge "qseecom: Fix ICE create and wipe key issues" into msm-4.9 (aeca962e) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/misc/qseecom.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -5869,7 +5869,8 @@ static int qseecom_create_key(struct qseecom_dev_handle *data,
		* It will return false if it is GPCE based crypto instance or
		* ICE is setup properly
		*/
		if (qseecom_enable_ice_setup(create_key_req.usage))
		ret = qseecom_enable_ice_setup(create_key_req.usage);
		if (ret)
		goto free_buf;

		do {
		@@ -5998,7 +5999,8 @@ static int qseecom_wipe_key(struct qseecom_dev_handle *data,
		* It will return false if it is GPCE based crypto instance or
		* ICE is setup properly
		*/
		if (qseecom_enable_ice_setup(wipe_key_req.usage))
		ret = qseecom_enable_ice_setup(wipe_key_req.usage);
		if (ret)
		goto free_buf;

		ret = __qseecom_set_clear_ce_key(data, wipe_key_req.usage,