summaryrefslogtreecommitdiffstats
path: root/net/phonet/pn_dev.c
diff options
context:
space:
mode:
authorremi.denis-courmont@nokia <remi.denis-courmont@nokia>2009-01-23 04:00:28 +0100
committerDavid S. Miller <davem@davemloft.net>2009-01-27 06:03:34 +0100
commit660f706d931d4795d341805e083a8091af74fa88 (patch)
treeac5cc51b70b0c30c1835362eaf883df965bb27f9 /net/phonet/pn_dev.c
parentPhonet: allow phonet_device_init() to fail, put it to __init section (diff)
downloadlinux-660f706d931d4795d341805e083a8091af74fa88.tar.xz
linux-660f706d931d4795d341805e083a8091af74fa88.zip
Phonet: handle rtnetlink registration failure
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.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c
index af49db01d634..fd418107652b 100644
--- a/net/phonet/pn_dev.c
+++ b/net/phonet/pn_dev.c
@@ -190,9 +190,13 @@ static struct notifier_block phonet_device_notifier = {
/* Initialize Phonet devices list */
int __init phonet_device_init(void)
{
+ int err;
+
register_netdevice_notifier(&phonet_device_notifier);
- phonet_netlink_register();
- return 0;
+ err = phonet_netlink_register();
+ if (err)
+ phonet_device_exit();
+ return err;
}
void phonet_device_exit(void)