Merge "security: pfk: Error code was overwritten" (08c78f81) · Commits · e / devices / android_kernel_fairphone_FP3

security/pfe/pfk_ice.c

+2 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -138,6 +138,7 @@ int qti_pfk_ice_set_key(uint32_t index, uint8_t key, uint8_t salt,
		if (ret1)
		pr_err("%s: Invalidate Key Error: %d\n", __func__,
		ret1);
		goto out;
		}
		ret = qcom_ice_setup_ice_hw((const char *)s_type, false);