From 9e09b308a2f2ba60f1af65b5413dd942dd1e6d8b Mon Sep 17 00:00:00 2001 From: Wootak Jung Date: Fri, 5 Jan 2024 17:20:58 +0900 Subject: [PATCH] Fix issue where state is not restored when adv operation fails Change-Id: I72428877125969a9dd682d6a2124775e45f258a4 Signed-off-by: Wootak Jung --- bt-oal/oal-gatt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bt-oal/oal-gatt.c b/bt-oal/oal-gatt.c index 039dd7e..d162d7c 100644 --- a/bt-oal/oal-gatt.c +++ b/bt-oal/oal-gatt.c @@ -453,7 +453,6 @@ oal_status_t gatts_multi_adv_enable(int instance_id) BT_ERR("Not allowed, state: %d, instance_id: %d", info->state, instance_id); return OAL_STATUS_BUSY; } - info->state = GATT_INS_ENABLING; ret = gatt_api->server->multi_adv_enable(instance_id); if (ret != BT_STATUS_SUCCESS) { @@ -462,6 +461,8 @@ oal_status_t gatts_multi_adv_enable(int instance_id) // gatt_servers[instance_id - 1].state = GATT_INS_DATA_SET; return convert_to_oal_status(ret); } + + info->state = GATT_INS_ENABLING; return OAL_STATUS_SUCCESS; } @@ -561,7 +562,6 @@ oal_status_t gatts_multi_adv_set_inst_data(int instance_id, BT_ERR("Not Allowed, state: %d, instance_id: %d", info->state, instance_id); return OAL_STATUS_BUSY; } - info->state = GATT_INS_DATA_SETTING; adv_setup.set_scan_rsp = adv_param_setup->set_scan_rsp; adv_setup.include_name = adv_param_setup->include_name; @@ -600,6 +600,8 @@ oal_status_t gatts_multi_adv_set_inst_data(int instance_id, info->state = GATT_INS_DISABLED; return convert_to_oal_status(ret); } + + info->state = GATT_INS_DATA_SETTING; return OAL_STATUS_SUCCESS; } -- 2.7.4