Commit f689e9e0 authored Mar 13, 2018 by Blagovest Kolenichev

Revert "security: pfk: Error code was overwritten"



This reverts commit c23efa56.

This is temporary due to hard conflicts against android-4.9.84.

Intake is switched from android-4.9-o to android-4.9 with LSK
tag 4.9.84 and more time is needed to rework the FBE changeset
[1] according to the new upstream changes coming from
android-4.9.

[1] c23efa56 security: pfk: Error code was overwritten
    7b939265 Enable HW File Based Encryption on ext4 file system

Change-Id: Iadb627691de77c195eb8644b2e9329ed9b764d64
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>

parent 4c446fd4

security/pfe/pfk_ice.c

+1 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2017, 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,7 +138,6 @@ 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);