---

yaml --- r: 144591 b: refs/heads/master c: 1363d9b h: refs/heads/master i: 144589: 44c39af 144587: f1cb7c9 144583: c6e6ef9 144575: 5cac01f v: v3
git-mirror · May 1, 2009 · 59f8a8a · 59f8a8a
1 parent 8a3ac74
commit 59f8a8a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c047fcd245975f40312ed57bf43e7d4abd188e6b
+refs/heads/master: 1363d9b135270662852ed2e6629fb79a36de5400
diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c
@@ -5158,16 +5158,15 @@ int bond_create(char *name, struct bond_params *params)
 	up_write(&bonding_rwsem);
 	rtnl_unlock(); /* allows sysfs registration of net device */
 	res = bond_create_sysfs_entry(netdev_priv(bond_dev));
-	if (res < 0) {
-		rtnl_lock();
-		down_write(&bonding_rwsem);
-		bond_deinit(bond_dev);
-		unregister_netdevice(bond_dev);
-		goto out_rtnl;
-	}
+	if (res < 0)
+		goto out_unreg;
 
 	return 0;
 
+out_unreg:
+	rtnl_lock();
+	down_write(&bonding_rwsem);
+	unregister_netdevice(bond_dev);
 out_bond:
 	bond_deinit(bond_dev);
 out_netdev: