diff options
| author | Abhishek Pandit-Subedi <abhishekpandit@chromium.org> | 2020-03-19 17:07:13 -0700 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2020-03-23 18:48:50 +0100 |
| commit | 2d186fcd6d8d3a493894de48611e4925ddf7b951 (patch) | |
| tree | 8a095748bca6aa661de740d8983e7515b53850cc /net/bluetooth | |
| parent | 8731840a345fb7ebfd0174ecc29aa21623bc2899 (diff) | |
| download | linux-2d186fcd6d8d3a493894de48611e4925ddf7b951.tar.gz linux-2d186fcd6d8d3a493894de48611e4925ddf7b951.tar.bz2 linux-2d186fcd6d8d3a493894de48611e4925ddf7b951.zip | |
Bluetooth: Fix incorrect branch in connection complete
When handling auto-connected devices, we should execute the rest of the
connection complete when it was previously discovered and it is an ACL
connection.
Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/hci_event.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 20408d386268..cd3d7d90029b 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -2539,16 +2539,17 @@ static void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) bt_dev_err(hdev, "no memory for new conn"); goto unlock; } - } - - if (ev->link_type != SCO_LINK) - goto unlock; + } else { + if (ev->link_type != SCO_LINK) + goto unlock; - conn = hci_conn_hash_lookup_ba(hdev, ESCO_LINK, &ev->bdaddr); - if (!conn) - goto unlock; + conn = hci_conn_hash_lookup_ba(hdev, ESCO_LINK, + &ev->bdaddr); + if (!conn) + goto unlock; - conn->type = SCO_LINK; + conn->type = SCO_LINK; + } } if (!ev->status) { |