From f322e8a2c62e765f434d14bd77ed97594b0acaa1 Mon Sep 17 00:00:00 2001 From: "faqiang.zhu" Date: Wed, 28 Nov 2018 21:35:37 +0800 Subject: [PATCH] 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 --- drivers/usb/gadget/f_fastboot.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index 0962346..e7a7b39 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -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; -- 1.9.1