diff --git a/lib/avb/libavb_user/avb_ops_user.c b/lib/avb/libavb_user/avb_ops_user.c
index d51866a696..e1119c2363 100644
--- a/lib/avb/libavb_user/avb_ops_user.c
+++ b/lib/avb/libavb_user/avb_ops_user.c
@@ -252,8 +252,13 @@ static AvbIOResult read_rollback_index(AvbOps *ops,
 		}
 
 		return ret;
+#else
+		*out_rollback_index = 0;
+
+		return AVB_IO_RESULT_OK;
 #endif
 	}
+
 	return AVB_IO_RESULT_ERROR_IO;
 }
 
@@ -304,6 +309,10 @@ static AvbIOResult read_is_device_unlocked(AvbOps *ops, bool *out_is_unlocked)
 			printf("%s: trusty_read_lock_state failed\n", __FILE__);
 		}
 		return ret;
+#else
+		*out_is_unlocked = 1;
+
+		return AVB_IO_RESULT_OK;
 #endif
 	}
 	return AVB_IO_RESULT_ERROR_IO;
diff --git a/lib/avb/rk_avb_user/rk_avb_ops_user.c b/lib/avb/rk_avb_user/rk_avb_ops_user.c
index 89b98751f4..abc6bd40cb 100644
--- a/lib/avb/rk_avb_user/rk_avb_ops_user.c
+++ b/lib/avb/rk_avb_user/rk_avb_ops_user.c
@@ -370,13 +370,10 @@ out:
 int rk_avb_read_bootloader_locked_flag(uint8_t *flag)
 {
 #ifdef CONFIG_OPTEE_CLIENT
-	if (trusty_read_vbootkey_enable_flag(flag)) {
+	if (trusty_read_vbootkey_enable_flag(flag))
 		return -1;
-	}
-	return 0;
-#else
-	return -1;
 #endif
+	return 0;
 }
 
 #ifdef CONFIG_SUPPORT_EMMC_RPMB