Bluetooth: audio: pacs: Fix redundant CCCD attribute without location

This removes the CCCD that was added even if location attribute was not there. Signed-off-by: Mariusz Skamra <[email protected]>
ryangenz · Oct 19, 2022 · fc398ac · fc398ac
1 parent 77abc49
commit fc398ac
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/subsys/bluetooth/audio/pacs.c b/subsys/bluetooth/audio/pacs.c
@@ -439,37 +439,41 @@ BT_GATT_SERVICE_DEFINE(pacs_svc,
 		      BT_GATT_PERM_READ_ENCRYPT,
 		      snk_read, NULL, NULL),
 	BT_AUDIO_CCC(snk_cfg_changed),
+#if defined(CONFIG_BT_PAC_SNK_LOC)
 #if defined(CONFIG_BT_PAC_SNK_LOC_WRITEABLE)
 	BT_AUDIO_CHRC(BT_UUID_PACS_SNK_LOC,
 		      BT_GATT_CHRC_READ | BT_GATT_CHRC_WRITE | BT_GATT_CHRC_NOTIFY,
 		      BT_GATT_PERM_READ_ENCRYPT | BT_GATT_PERM_WRITE_ENCRYPT,
 		      snk_loc_read, snk_loc_write, NULL),
-#elif defined(CONFIG_BT_PAC_SNK_LOC)
+#else
 	BT_AUDIO_CHRC(BT_UUID_PACS_SNK_LOC,
 		      BT_GATT_CHRC_READ | BT_GATT_CHRC_NOTIFY,
 		      BT_GATT_PERM_READ_ENCRYPT,
 		      snk_loc_read, NULL, NULL),
 #endif /* CONFIG_BT_PAC_SNK_LOC_WRITEABLE */
 	BT_AUDIO_CCC(snk_loc_cfg_changed),
+#endif /* CONFIG_BT_PAC_SNK_LOC */
 #endif /* CONFIG_BT_PAC_SNK */
 #if defined(CONFIG_BT_PAC_SRC)
 	BT_AUDIO_CHRC(BT_UUID_PACS_SRC,
 		      BT_GATT_CHRC_READ | BT_GATT_CHRC_NOTIFY,
 		      BT_GATT_PERM_READ_ENCRYPT,
 		      src_read, NULL, NULL),
 	BT_AUDIO_CCC(src_cfg_changed),
+#if defined(CONFIG_BT_PAC_SRC_LOC)
 #if defined(CONFIG_BT_PAC_SRC_LOC_WRITEABLE)
 	BT_AUDIO_CHRC(BT_UUID_PACS_SRC_LOC,
 		      BT_GATT_CHRC_READ | BT_GATT_CHRC_WRITE | BT_GATT_CHRC_NOTIFY,
 		      BT_GATT_PERM_READ_ENCRYPT | BT_GATT_PERM_WRITE_ENCRYPT,
 		      src_loc_read, src_loc_write, NULL),
-#elif defined(CONFIG_BT_PAC_SRC_LOC)
+#else
 	BT_AUDIO_CHRC(BT_UUID_PACS_SRC_LOC,
 		      BT_GATT_CHRC_READ | BT_GATT_CHRC_NOTIFY,
 		      BT_GATT_PERM_READ_ENCRYPT,
 		      src_loc_read, NULL, NULL),
 #endif /* CONFIG_BT_PAC_SRC_LOC_WRITEABLE */
 	BT_AUDIO_CCC(src_loc_cfg_changed),
+#endif /* CONFIG_BT_PAC_SRC_LOC */
 #endif /* CONFIG_BT_PAC_SRC */
 	BT_AUDIO_CHRC(BT_UUID_PACS_AVAILABLE_CONTEXT,
 		      BT_GATT_CHRC_READ | BT_GATT_CHRC_NOTIFY,