MA-13603 change unlock logic to firstly judge unlocked or not

to handle situations that it is not allowed to unlock but the board is
already unlocked, unlock logic is modified in this patch

Change-Id: I90b22c2dfbc1c64ed9514032986e98b27526c7b9
Signed-off-by: faqiang.zhu <faqiang.zhu@nxp.com>
This commit is contained in:
faqiang.zhu 2018-11-28 21:35:37 +08:00
parent 654088cc21
commit f322e8a2c6
1 changed files with 4 additions and 4 deletions

View File

@ -3605,12 +3605,12 @@ static FbLockState do_fastboot_unlock(bool force)
{
int status;
if (fastboot_get_lock_stat() == FASTBOOT_UNLOCK) {
printf("The device is already unlocked\n");
return FASTBOOT_UNLOCK;
}
if ((fastboot_lock_enable() == FASTBOOT_UL_ENABLE) || force) {
printf("It is able to unlock device. %d\n",fastboot_lock_enable());
if (fastboot_get_lock_stat() == FASTBOOT_UNLOCK) {
printf("The device is already unlocked\n");
return FASTBOOT_UNLOCK;
}
status = fastboot_set_lock_stat(FASTBOOT_UNLOCK);
if (status < 0)
return FASTBOOT_LOCK_ERROR;