ACPI add ia64 exports to build acpi_memhotplug as a module

[linux-2.6-omap-h63xx.git] / net / bridge / br_if.c

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 59eef42d4a4259052c67dbe91f07f908767c9437..ad1c7af65ec8dcb944b59d2310df3c9ec539805d 100644 (file)
--- a/net/bridge/br_if.c
+++ b/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)