commit 76e02cf6945e6faa9f6b546dc0513512197c5966
author remi.denis-courmont@nokia <remi.denis-courmont@nokia> Fri Jan 23 03:00:27 2009 +0000
committer David S. Miller <davem@davemloft.net> Mon Jan 26 21:03:34 2009 -0800
tree e296f93f6ba6571443704871bf2d399a3bc5b98e
parent 4b8f704bea70a2c8719e47f53197678a87a0c62f

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>

net/phonet/af_phonet.c

diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c
index c7c39d9..95bc49d 100644
--- a/net/phonet/af_phonet.c
+++ b/net/phonet/af_phonet.c
@@ -426,16 +426,18 @@
 {
 	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 @@
 	phonet_sysctl_exit();
 	sock_unregister(PF_PHONET);
 	dev_remove_pack(&phonet_packet_type);
+err_sock:
 	phonet_device_exit();
 	return err;
 }