summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_core.c
diff options
context:
space:
mode:
authorDavid Herrmann2011-10-08 14:58:47 +0200
committerGustavo F. Padovan2011-10-14 20:22:28 +0200
commit0ac7e7002c4d0841197e9ccb8cfecc5b8c58b200 (patch)
tree5050ba12aedf48b75660ab9175fcae26250cd603 /net/bluetooth/hci_core.c
parentBluetooth: AMP: read local amp info HCI command (diff)
downloadkernel-qcow2-linux-0ac7e7002c4d0841197e9ccb8cfecc5b8c58b200.tar.gz
kernel-qcow2-linux-0ac7e7002c4d0841197e9ccb8cfecc5b8c58b200.tar.xz
kernel-qcow2-linux-0ac7e7002c4d0841197e9ccb8cfecc5b8c58b200.zip
Bluetooth: Fix hci core device initialization
We must not call device_del() if we didn't use device_add(). See module.c for comments on that. Therefore, we need to call device_initialize() when allocating the hci device and later device_add() instead of device_register(). This also fixes a bug when hci_register_dev() failed and we call hci_free_dev() without a valid core device. hci_free_dev() segfaults while calling put_device() on invalid memory. We already do this with hci_conn connections (hci_conn_init_sysfs()) so they do not need to be fixed. Signed-off-by: David Herrmann <dh.herrmann@googlemail.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/hci_core.c')
-rw-r--r--net/bluetooth/hci_core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index b84458dcc226..d2445cb06c42 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -912,6 +912,7 @@ struct hci_dev *hci_alloc_dev(void)
if (!hdev)
return NULL;
+ hci_init_sysfs(hdev);
skb_queue_head_init(&hdev->driver_init);
return hdev;