diff options
| author | remi.denis-courmont@nokia <remi.denis-courmont@nokia> | 2009-01-23 04:00:27 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-27 06:03:34 +0100 |
| commit | 76e02cf6945e6faa9f6b546dc0513512197c5966 (patch) | |
| tree | e296f93f6ba6571443704871bf2d399a3bc5b98e /net/phonet | |
| parent | Phonet: check destination before delivering packets locally (diff) | |
| download | linux-76e02cf6945e6faa9f6b546dc0513512197c5966.tar.xz linux-76e02cf6945e6faa9f6b546dc0513512197c5966.zip | |
Phonet: allow phonet_device_init() to fail, put it to __init section
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/phonet')
| -rw-r--r-- | net/phonet/af_phonet.c | 9 | ||||
| -rw-r--r-- | net/phonet/pn_dev.c | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c index c7c39d92ee5e..95bc49ddb8bf 100644 --- a/net/phonet/af_phonet.c +++ b/net/phonet/af_phonet.c @@ -426,16 +426,18 @@ static int __init phonet_init(void) { int err; + err = phonet_device_init(); + if (err) + return err; + err = sock_register(&phonet_proto_family); if (err) { printk(KERN_ALERT "phonet protocol family initialization failed\n"); - return err; + goto err_sock; } - phonet_device_init(); dev_add_pack(&phonet_packet_type); - phonet_netlink_register(); phonet_sysctl_init(); err = isi_register(); @@ -447,6 +449,7 @@ err: phonet_sysctl_exit(); sock_unregister(PF_PHONET); dev_remove_pack(&phonet_packet_type); +err_sock: phonet_device_exit(); return err; } diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c index 5491bf5e354b..af49db01d634 100644 --- a/net/phonet/pn_dev.c +++ b/net/phonet/pn_dev.c @@ -188,9 +188,11 @@ static struct notifier_block phonet_device_notifier = { }; /* Initialize Phonet devices list */ -void phonet_device_init(void) +int __init phonet_device_init(void) { register_netdevice_notifier(&phonet_device_notifier); + phonet_netlink_register(); + return 0; } void phonet_device_exit(void) |