diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-14 14:17:58 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-14 14:17:58 -0500 |
| commit | 485f2b7f5fd30f30a781d68b6190d6b293977d83 (patch) | |
| tree | 8d6dd1b93fb216cfb6b377402e06c557e0cb8b53 /net/bluetooth/hci_core.c | |
| parent | e734207fee61a76645ea3b3348180226ee4bc54e (diff) | |
| parent | 482049f75750d73358e65236b933417b69f9cc25 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'net/bluetooth/hci_core.c')
| -rw-r--r-- | net/bluetooth/hci_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 8a0ce706aeb..a0a2f97b9c6 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -1754,11 +1754,11 @@ int hci_register_dev(struct hci_dev *hdev) if (hdev->dev_type != HCI_AMP) set_bit(HCI_AUTO_OFF, &hdev->dev_flags); - schedule_work(&hdev->power_on); - hci_notify(hdev, HCI_DEV_REG); hci_dev_hold(hdev); + schedule_work(&hdev->power_on); + return id; err_wqueue: |