git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
bluetooth
/
af_bluetooth.c
diff --git
a/net/bluetooth/af_bluetooth.c
b/net/bluetooth/af_bluetooth.c
index
469eda0
..
788ea7a
100644
(file)
--- a/
net/bluetooth/af_bluetooth.c
+++ b/
net/bluetooth/af_bluetooth.c
@@
-24,7
+24,6
@@
/* Bluetooth address family and sockets. */
/* Bluetooth address family and sockets. */
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/types.h>
@@
-49,7
+48,7
@@
#define BT_DBG(D...)
#endif
#define BT_DBG(D...)
#endif
-#define VERSION "2.
8
"
+#define VERSION "2.
10
"
/* Bluetooth sockets */
#define BT_MAX_PROTO 8
/* Bluetooth sockets */
#define BT_MAX_PROTO 8
@@
-308,13
+307,21
@@
static struct net_proto_family bt_sock_family_ops = {
static int __init bt_init(void)
{
static int __init bt_init(void)
{
+ int err;
+
BT_INFO("Core ver %s", VERSION);
BT_INFO("Core ver %s", VERSION);
- sock_register(&bt_sock_family_ops);
+ err = bt_sysfs_init();
+ if (err < 0)
+ return err;
- BT_INFO("HCI device and connection manager initialized");
+ err = sock_register(&bt_sock_family_ops);
+ if (err < 0) {
+ bt_sysfs_cleanup();
+ return err;
+ }
-
bt_sysfs_init(
);
+
BT_INFO("HCI device and connection manager initialized"
);
hci_sock_init();
hci_sock_init();
@@
-325,9
+332,9
@@
static void __exit bt_exit(void)
{
hci_sock_cleanup();
{
hci_sock_cleanup();
- bt_sysfs_cleanup();
-
sock_unregister(PF_BLUETOOTH);
sock_unregister(PF_BLUETOOTH);
+
+ bt_sysfs_cleanup();
}
subsys_initcall(bt_init);
}
subsys_initcall(bt_init);