1 files changed, 2 insertions, 6 deletions

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index c2fd6bc5f080..e74b6d530cb6 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -195,8 +195,7 @@ void br_ifinfo_notify(int event, struct net_bridge_port *port)
         rtnl_notify(skb, net, 0, RTNLGRP_LINK, NULL, GFP_ATOMIC);
         return;
 errout:
-        if (err < 0)
-                rtnl_set_sk_err(net, RTNLGRP_LINK, err);
+        rtnl_set_sk_err(net, RTNLGRP_LINK, err);
 }
 
 
@@ -482,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)
@@ -494,7 +491,6 @@ int __init br_netlink_init(void)
 
 out_af:
         rtnl_af_unregister(&br_af_ops);
-out:
         br_mdb_uninit();
         return err;
 }