From aee624aa750e3c78065bad3695daf277773c39d7 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Wed, 26 Oct 2011 10:43:19 +0200 Subject: [PATCH] --- yaml --- r: 277703 b: refs/heads/master c: 59735631d24e3463f139a21255e0db94bc59081e h: refs/heads/master i: 277701: 78dd432c0e9b470f004e7fad5c64345a32d387a4 277699: fbf088c9b30a82661ace4e6d2910d5a5aa3908bf 277695: c6cd586e7ffebb5e8c47bda2b41c199b17a349b2 v: v3 --- [refs] | 2 +- trunk/include/net/bluetooth/hci_core.h | 2 +- trunk/net/bluetooth/hci_core.c | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index acf03c0a1c13..ae3b072fb280 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13ea4015d37d2dbe597580898b5fafbe6f593f72 +refs/heads/master: 59735631d24e3463f139a21255e0db94bc59081e diff --git a/trunk/include/net/bluetooth/hci_core.h b/trunk/include/net/bluetooth/hci_core.h index 119b795b2850..967e18f72a38 100644 --- a/trunk/include/net/bluetooth/hci_core.h +++ b/trunk/include/net/bluetooth/hci_core.h @@ -554,7 +554,7 @@ struct hci_dev *hci_get_route(bdaddr_t *src, bdaddr_t *dst); struct hci_dev *hci_alloc_dev(void); void hci_free_dev(struct hci_dev *hdev); int hci_register_dev(struct hci_dev *hdev); -int hci_unregister_dev(struct hci_dev *hdev); +void hci_unregister_dev(struct hci_dev *hdev); int hci_suspend_dev(struct hci_dev *hdev); int hci_resume_dev(struct hci_dev *hdev); int hci_dev_open(__u16 dev); diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c index fdcbf8fc26ad..557ff90331b9 100644 --- a/trunk/net/bluetooth/hci_core.c +++ b/trunk/net/bluetooth/hci_core.c @@ -1541,7 +1541,7 @@ int hci_register_dev(struct hci_dev *hdev) EXPORT_SYMBOL(hci_register_dev); /* Unregister HCI device */ -int hci_unregister_dev(struct hci_dev *hdev) +void hci_unregister_dev(struct hci_dev *hdev) { int i; @@ -1583,8 +1583,6 @@ int hci_unregister_dev(struct hci_dev *hdev) hci_dev_unlock_bh(hdev); __hci_dev_put(hdev); - - return 0; } EXPORT_SYMBOL(hci_unregister_dev);