diff --git a/[refs] b/[refs] index b733f389d08a..d7f7c81486bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b17a7c179dd3ce7d04373fddf660eda21efc9db9 +refs/heads/master: ac05202e8b83594bf6797d241371e6c752f371e6 diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c index 59eef42d4a42..ad1c7af65ec8 100644 --- a/trunk/net/bridge/br_if.c +++ b/trunk/net/bridge/br_if.c @@ -308,26 +308,19 @@ int br_add_bridge(const char *name) if (ret) goto err2; - /* network device kobject is not setup until - * after rtnl_unlock does it's hotplug magic. - * so hold reference to avoid race. - */ - dev_hold(dev); - rtnl_unlock(); - ret = br_sysfs_addbr(dev); - dev_put(dev); - - if (ret) - unregister_netdev(dev); - out: - return ret; + if (ret) + goto err3; + rtnl_unlock(); + return 0; + err3: + unregister_netdev(dev); err2: free_netdev(dev); err1: rtnl_unlock(); - goto out; + return ret; } int br_del_bridge(const char *name)