Merge tag 'for-net-next-2021-08-19' of git://git.kernel.org/pub/scm/linux/kernel...

Luiz Augusto von Dentz says:

====================
bluetooth-next pull request for net-next:

 - Add support for Foxconn Mediatek Chip
 - Add support for LG LGSBWAC92/TWCM-K505D
 - hci_h5 flow control fixes and suspend support
 - Switch to use lock_sock for SCO and RFCOMM
 - Various fixes for extended advertising
 - Reword Intel's setup on btusb unifying the supported generations
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc net/bluetooth/hci_core.c
index e1a545c8a69f8b13abce92607ee68d8dfaf4f7ca,fb296478b86e4b8ff39c13d2f7e5ccb67c84b5c6..8a47a3017d61de76a9f3c5e5c06a95b5908e4c6c
--- 1/net/bluetooth/hci_core.c
--- 2/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@@ -4034,7 -4048,6 +4048,7 @@@ void hci_unregister_dev(struct hci_dev 
        }
  
        device_del(&hdev->dev);
-       /* Actual cleanup is deferred until hci_cleanup_dev(). */
++      /* Actual cleanup is deferred until hci_release_dev(). */
        hci_dev_put(hdev);
  }
  EXPORT_SYMBOL(hci_unregister_dev);

diff --cc net/bluetooth/hci_sysfs.c
index b69d88b88d2e4f25dc725b147bcb373a2eee8404,ebf282d1eb2b1b691d4aea518738503ec4672001..7827639ecf5c3a961e95973e8d1384a1039e1b0b
--- 1/net/bluetooth/hci_sysfs.c
--- 2/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@@ -83,10 -83,7 +83,9 @@@ void hci_conn_del_sysfs(struct hci_con
  static void bt_host_release(struct device *dev)
  {
        struct hci_dev *hdev = to_hci_dev(dev);
 -      hci_release_dev(hdev);
 +
 +      if (hci_dev_test_flag(hdev, HCI_UNREGISTER))
-               hci_cleanup_dev(hdev);
-       kfree(hdev);
++              hci_release_dev(hdev);
        module_put(THIS_MODULE);
  }