diff options
author | remi.denis-courmont@nokia <remi.denis-courmont@nokia> | 2009-01-22 22:00:27 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-27 00:03:34 -0500 |
commit | 76e02cf6945e6faa9f6b546dc0513512197c5966 (patch) | |
tree | e296f93f6ba6571443704871bf2d399a3bc5b98e /net/phonet/pn_dev.c | |
parent | 4b8f704bea70a2c8719e47f53197678a87a0c62f (diff) |
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/pn_dev.c')
-rw-r--r-- | net/phonet/pn_dev.c | 4 |
1 files changed, 3 insertions, 1 deletions
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 = { | |||
188 | }; | 188 | }; |
189 | 189 | ||
190 | /* Initialize Phonet devices list */ | 190 | /* Initialize Phonet devices list */ |
191 | void phonet_device_init(void) | 191 | int __init phonet_device_init(void) |
192 | { | 192 | { |
193 | register_netdevice_notifier(&phonet_device_notifier); | 193 | register_netdevice_notifier(&phonet_device_notifier); |
194 | phonet_netlink_register(); | ||
195 | return 0; | ||
194 | } | 196 | } |
195 | 197 | ||
196 | void phonet_device_exit(void) | 198 | void phonet_device_exit(void) |