From 439d428ca7882e6ce95552b7e7992574f74f9357 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Wed, 5 Mar 2008 18:47:03 -0800 Subject: [PATCH] --- yaml --- r: 87223 b: refs/heads/master c: 04005dd9ae7bf1031408869c33df96149ebb1086 h: refs/heads/master i: 87221: 6a96ebba3a6dd1c28690454a6f0182f3c5baca4b 87219: 46be36b5692d352437b09b2a64aee0e1c2ca648b 87215: c1fe1f7acfd91f6d8aa15eb59b28c4728edab45a v: v3 --- [refs] | 2 +- trunk/include/net/bluetooth/bluetooth.h | 2 +- trunk/net/bluetooth/hci_sock.c | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 30abe003da65..8619443a9605 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 147e2d59833e994cc99341806a88b9e59be41391 +refs/heads/master: 04005dd9ae7bf1031408869c33df96149ebb1086 diff --git a/trunk/include/net/bluetooth/bluetooth.h b/trunk/include/net/bluetooth/bluetooth.h index 771d17783c18..750648df13f4 100644 --- a/trunk/include/net/bluetooth/bluetooth.h +++ b/trunk/include/net/bluetooth/bluetooth.h @@ -170,7 +170,7 @@ static inline int skb_frags_no(struct sk_buff *skb) int bt_err(__u16 code); extern int hci_sock_init(void); -extern int hci_sock_cleanup(void); +extern void hci_sock_cleanup(void); extern int bt_sysfs_init(void); extern void bt_sysfs_cleanup(void); diff --git a/trunk/net/bluetooth/hci_sock.c b/trunk/net/bluetooth/hci_sock.c index 14991323c273..b5d4019d3572 100644 --- a/trunk/net/bluetooth/hci_sock.c +++ b/trunk/net/bluetooth/hci_sock.c @@ -734,7 +734,7 @@ int __init hci_sock_init(void) return err; } -int __exit hci_sock_cleanup(void) +void __exit hci_sock_cleanup(void) { if (bt_sock_unregister(BTPROTO_HCI) < 0) BT_ERR("HCI socket unregistration failed"); @@ -742,6 +742,4 @@ int __exit hci_sock_cleanup(void) hci_unregister_notifier(&hci_sock_nblock); proto_unregister(&hci_sk_proto); - - return 0; }