Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-4965-rs.c
	drivers/net/wireless/rt2x00/rt61pci.c

1 files changed, 7 insertions, 5 deletions

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 77a981a1ee52..c2397f503b0f 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -273,15 +273,13 @@ int br_add_bridge(const char *name)
         rtnl_lock();
         if (strchr(dev->name, '%')) {
                 ret = dev_alloc_name(dev, dev->name);
-                if (ret < 0) {
-                        free_netdev(dev);
-                        goto out;
-                }
+                if (ret < 0)
+                        goto out_free;
         }
 
         ret = register_netdevice(dev);
         if (ret)
-                goto out;
+                goto out_free;
 
         ret = br_sysfs_addbr(dev);
         if (ret)
@@ -289,6 +287,10 @@ int br_add_bridge(const char *name)
  out:
         rtnl_unlock();
         return ret;
+
+out_free:
+        free_netdev(dev);
+        goto out;
 }
 
 int br_del_bridge(const char *name)