Bluetooth: Use bt_dev_err and bt_dev_info when possible

[mirror_ubuntu-bionic-kernel.git] / net / bluetooth / hci_conn.c

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index dc59eae5471788e42091ba7fc907585d36e99c2d..a9682534c3779fd12510d7f6a82bf1fcab6c88e9 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -729,8 +729,8 @@ static void create_le_conn_complete(struct hci_dev *hdev, u8 status, u16 opcode)
                goto done;
        }
 
-       BT_ERR("HCI request failed to create LE connection: status 0x%2.2x",
-              status);
+       bt_dev_err(hdev, "request failed to create LE connection: "
+                  "status 0x%2.2x", status);
 
        if (!conn)
                goto done;
@@ -907,7 +907,7 @@ struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,
                 */
                if (hci_dev_test_flag(hdev, HCI_LE_SCAN) &&
                    hdev->le_scan_type == LE_SCAN_ACTIVE) {
-                       skb_queue_purge(&req.cmd_q);
+                       hci_req_purge(&req);
                        hci_conn_del(conn);
                        return ERR_PTR(-EBUSY);
                }