From a9f855e2bf0ba0a1dd44c04aed82c6b64a91dd4a Mon Sep 17 00:00:00 2001 From: Morten Priess Date: Tue, 5 Jul 2022 11:29:49 +0200 Subject: [PATCH] Bluetooth: controller: Fix error in ISO reset sequence To avoid races, ull_conn_iso_reset must be performed before higher level ull_iso_reset. Signed-off-by: Morten Priess --- subsys/bluetooth/controller/ll_sw/ull.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/subsys/bluetooth/controller/ll_sw/ull.c b/subsys/bluetooth/controller/ll_sw/ull.c index c7fc25603cf..2f1424ea100 100644 --- a/subsys/bluetooth/controller/ll_sw/ull.c +++ b/subsys/bluetooth/controller/ll_sw/ull.c @@ -789,16 +789,16 @@ void ll_reset(void) LL_ASSERT(!err); #endif /* CONFIG_BT_OBSERVER */ -#if defined(CONFIG_BT_CTLR_ISO) - err = ull_iso_reset(); - LL_ASSERT(!err); -#endif /* CONFIG_BT_CTLR_ISO */ - #if defined(CONFIG_BT_CTLR_CONN_ISO) err = ull_conn_iso_reset(); LL_ASSERT(!err); #endif /* CONFIG_BT_CTLR_CONN_ISO */ +#if defined(CONFIG_BT_CTLR_ISO) + err = ull_iso_reset(); + LL_ASSERT(!err); +#endif /* CONFIG_BT_CTLR_ISO */ + #if defined(CONFIG_BT_CTLR_PERIPHERAL_ISO) err = ull_peripheral_iso_reset(); LL_ASSERT(!err);