summaryrefslogtreecommitdiff
path: root/drivers/crypto
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-06-29 11:34:46 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-06-29 11:34:46 -0700
commit40f83efeabc221b28be0f12f31173e46f66c9f5c (patch)
tree9c47b8abd9f1387d5db824ed200eee72d459a142 /drivers/crypto
parented7868840b94308846984e05068c37ff6f21e90c (diff)
parent2e4bedb43c9163945a31c441907710d998ade443 (diff)
Merge "scsi: ufs: Unblock UFS while ICE HW configuration"
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/msm/ice.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/crypto/msm/ice.c b/drivers/crypto/msm/ice.c
index 4002a5b57250..f99a421c0ee4 100644
--- a/drivers/crypto/msm/ice.c
+++ b/drivers/crypto/msm/ice.c
@@ -125,6 +125,9 @@ static int qti_ice_setting_config(struct request *req,
return -EPERM;
}
+ if (!setting)
+ return -EINVAL;
+
if ((short)(crypto_data->key_index) >= 0) {
memcpy(&setting->crypto_data, crypto_data,