Merge tag 'block-5.13-2021-05-09' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / net / bluetooth / hci_conn.c

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 6ffa89e..88ec089 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -772,6 +772,16 @@ void hci_le_conn_failed(struct hci_conn *conn, u8 status)
 
        hci_conn_del(conn);
 
+       /* The suspend notifier is waiting for all devices to disconnect and an
+        * LE connect cancel will result in an hci_le_conn_failed. Once the last
+        * connection is deleted, we should also wake the suspend queue to
+        * complete suspend operations.
+        */
+       if (list_empty(&hdev->conn_hash.list) &&
+           test_and_clear_bit(SUSPEND_DISCONNECTING, hdev->suspend_tasks)) {
+               wake_up(&hdev->suspend_wait_q);
+       }
+
        /* Since we may have temporarily stopped the background scanning in
         * favor of connection establishment, we should restart it.
         */
@@ -1830,8 +1840,6 @@ u32 hci_conn_get_phy(struct hci_conn *conn)
 {
        u32 phys = 0;
 
-       hci_dev_lock(conn->hdev);
-
        /* BLUETOOTH CORE SPECIFICATION Version 5.2 | Vol 2, Part B page 471:
         * Table 6.2: Packets defined for synchronous, asynchronous, and
         * CSB logical transport types.
@@ -1928,7 +1936,5 @@ u32 hci_conn_get_phy(struct hci_conn *conn)
                break;
        }
 
-       hci_dev_unlock(conn->hdev);
-
        return phys;
 }