Merge "msm: ice: check for crypto engine availability" (19094dd4) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/crypto/msm/ice.c

+2 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2014-2019, 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
		@@ -1798,7 +1798,7 @@ int qcom_ice_setup_ice_hw(const char *storage_type, int enable)
		if (ice_dev == ERR_PTR(-EPROBE_DEFER))
		return -EPROBE_DEFER;

		if (!ice_dev)
		if (!ice_dev \|\| (ice_dev->is_ice_enabled == false))
		return ret;

		if (enable)