---

yaml --- r: 263242 b: refs/heads/master c: 11f3a6b h: refs/heads/master v: v3
git-mirror · Aug 22, 2011 · 8680837 · 8680837
1 parent aa0875a
commit 8680837
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 832d80aceaab995c347d62abf7c241fc3e2eb0ce
+refs/heads/master: 11f3a6bdc2528d1ce2af50202dbf7138fdee1b34
diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c
@@ -231,6 +231,7 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br,
 int br_add_bridge(struct net *net, const char *name)
 {
 	struct net_device *dev;
+	int res;
 
 	dev = alloc_netdev(sizeof(struct net_bridge), name,
 			   br_dev_setup);
@@ -240,7 +241,10 @@ int br_add_bridge(struct net *net, const char *name)
 
 	dev_net_set(dev, net);
 
-	return register_netdev(dev);
+	res = register_netdev(dev);
+	if (res)
+		free_netdev(dev);
+	return res;
 }
 
 int br_del_bridge(struct net *net, const char *name)