Merge branch 'master' into staging-next

[karo-tx-linux.git] / net / bridge / br_netlink.c

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 6526ac89bbfa8f2ebf5532a55b662d4eb714b22e..e74b6d530cb6a3ab3dc650ee1900df06d3b3441a 100644 (file)
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -481,9 +481,7 @@ int __init br_netlink_init(void)
        int err;
 
        br_mdb_init();
-       err = rtnl_af_register(&br_af_ops);
-       if (err)
-               goto out;
+       rtnl_af_register(&br_af_ops);
 
        err = rtnl_link_register(&br_link_ops);
        if (err)
@@ -493,7 +491,6 @@ int __init br_netlink_init(void)
 
 out_af:
        rtnl_af_unregister(&br_af_ops);
-out:
        br_mdb_uninit();
        return err;
 }