From: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx> Make sure that AMP controller is registered only if HS enables. Return EINVAL if High Speed is not enabled and dev_type is HCI_AMP. Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx> --- net/bluetooth/hci_core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index bd26cb5..746af2d 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -1708,7 +1708,10 @@ int hci_register_dev(struct hci_dev *hdev) id = ida_simple_get(&hci_index_ida, 0, 0, GFP_KERNEL); break; case HCI_AMP: - id = ida_simple_get(&hci_index_ida, 1, 0, GFP_KERNEL); + if (enable_hs) + id = ida_simple_get(&hci_index_ida, 1, 0, GFP_KERNEL); + else + return -EINVAL; break; default: return -EINVAL; -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
