michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: ISO: Fix bad handle of data path error for broadcast

Browse source 
The way that the braodcast clause for handling failing
ISO data path would end up in the __ASSERT. It has been
slightly modified to make it use if-else properly.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2022-12-22 16:41:00 +01:00 • committed by Carles Cufí
commit 489e99c091
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
subsys/bluetooth/host/iso.c
View file

@ -368,10 +368,11 @@ void bt_iso_connected(struct bt_conn *iso)
err = bt_iso_setup_data_path(chan); err = bt_iso_setup_data_path(chan);
if (err != 0) { if (err != 0) {
LOG_ERR("Unable to setup data path: %d", err); if (false) {
#if defined(CONFIG_BT_ISO_BROADCAST) #if defined(CONFIG_BT_ISO_BROADCAST)
if (iso->iso.info.type == BT_ISO_CHAN_TYPE_BROADCASTER || } else if (iso->iso.info.type == BT_ISO_CHAN_TYPE_BROADCASTER ||
iso->iso.info.type == BT_ISO_CHAN_TYPE_SYNC_RECEIVER) { iso->iso.info.type == BT_ISO_CHAN_TYPE_SYNC_RECEIVER) {
struct bt_iso_big *big; struct bt_iso_big *big;
int err; int err;
@ -381,9 +382,9 @@ void bt_iso_connected(struct bt_conn *iso)
if (err != 0) { if (err != 0) {
LOG_ERR("Could not terminate BIG: %d", err); LOG_ERR("Could not terminate BIG: %d", err);
} }
}
#endif /* CONFIG_BT_ISO_BROADCAST */ #endif /* CONFIG_BT_ISO_BROADCAST */
if (IS_ENABLED(CONFIG_BT_ISO_UNICAST) &&
} else if (IS_ENABLED(CONFIG_BT_ISO_UNICAST) &&
iso->iso.info.type == BT_ISO_CHAN_TYPE_CONNECTED) { iso->iso.info.type == BT_ISO_CHAN_TYPE_CONNECTED) {
bt_conn_disconnect(iso, bt_conn_disconnect(iso,
BT_HCI_ERR_REMOTE_USER_TERM_CONN); BT_HCI_ERR_REMOTE_USER_TERM_CONN);