evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: ice: check for crypto engine availability" into kernel.lnx.4.4.r35-rel

Browse source
This commit is contained in:
Linux Build Service Account 2019-04-08 12:30:11 -07:00 • committed by Gerrit - the friendly Code Review server
commit c2c52e8d2b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/crypto/msm/ice.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2014-2017, 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 * 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 * it under the terms of the GNU General Public License version 2 and
@ -1729,7 +1729,7 @@ int qcom_ice_setup_ice_hw(const char *storage_type, int enable)
if (ice_dev == ERR_PTR(-EPROBE_DEFER)) if (ice_dev == ERR_PTR(-EPROBE_DEFER))
return -EPROBE_DEFER; return -EPROBE_DEFER;
if (!ice_dev) if (!ice_dev || (ice_dev->is_ice_enabled == false))
return ret; return ret;
if (enable) if (enable)