---

yaml
---
r: 27151
b: refs/heads/master
c: 3648570
h: refs/heads/master
i:
  27149: 35fc866
  27147: 49f9062
  27143: 1136254
  27135: 6a70082
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c893ff6abbac0c7c05b1cb9bfb6e2dfc4538c75
+refs/heads/master: 36485707bbd9729e0c52315b173aeed9bc2303dd

trunk/net/bridge/br_if.c

@@ -300,25 +300,20 @@ int br_add_bridge(const char *name)
 	rtnl_lock();
 	if (strchr(dev->name, '%')) {
 		ret = dev_alloc_name(dev, dev->name);
-		if (ret < 0)
-			goto err1;
+		if (ret < 0) {
+			free_netdev(dev);
+			goto out;
+		}
 	}
 
 	ret = register_netdevice(dev);
 	if (ret)
-		goto err2;
+		goto out;
 
 	ret = br_sysfs_addbr(dev);
 	if (ret)
-		goto err3;
-	rtnl_unlock();
-	return 0;
-
- err3:
-	unregister_netdev(dev);
- err2:
-	free_netdev(dev);
- err1:
+		unregister_netdevice(dev);
+ out:
 	rtnl_unlock();
 	return ret;
 }