mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-14 08:36:12 -04:00
Merge "soc: qcom: Return correct error code when program_key fails fails"
This commit is contained in:
commit
e96e5d2ed7
1 changed files with 9 additions and 9 deletions
|
|
@ -412,7 +412,7 @@ int crypto_qti_keyslot_program(void *priv_data,
|
|||
unsigned int slot,
|
||||
u8 data_unit_mask, int capid)
|
||||
{
|
||||
int err = 0;
|
||||
int err1 = 0, err2 = 0;
|
||||
struct crypto_vops_qti_entry *ice_entry;
|
||||
|
||||
ice_entry = (struct crypto_vops_qti_entry *) priv_data;
|
||||
|
|
@ -421,19 +421,19 @@ int crypto_qti_keyslot_program(void *priv_data,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
err = crypto_qti_program_key(ice_entry, key, slot,
|
||||
err1 = crypto_qti_program_key(ice_entry, key, slot,
|
||||
data_unit_mask, capid);
|
||||
if (err) {
|
||||
pr_err("%s: program key failed with error %d\n", __func__, err);
|
||||
err = crypto_qti_invalidate_key(ice_entry, slot);
|
||||
if (err) {
|
||||
if (err1) {
|
||||
pr_err("%s: program key failed with error %d\n",
|
||||
__func__, err1);
|
||||
err2 = crypto_qti_invalidate_key(ice_entry, slot);
|
||||
if (err2) {
|
||||
pr_err("%s: invalidate key failed with error %d\n",
|
||||
__func__, err);
|
||||
return err;
|
||||
__func__, err2);
|
||||
}
|
||||
}
|
||||
|
||||
return err;
|
||||
return err1;
|
||||
}
|
||||
EXPORT_SYMBOL(crypto_qti_keyslot_program);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue