From 59f8a8a546813812c30eb37d794a85590f8cf4ea Mon Sep 17 00:00:00 2001
From: Jiri Pirko <jpirko@redhat.com>
Date: Fri, 1 May 2009 15:35:28 -0700
Subject: [PATCH] --- yaml --- r: 144591 b: refs/heads/master c:
 1363d9b135270662852ed2e6629fb79a36de5400 h: refs/heads/master i:   144589:
 44c39af5996d587ee7252388672ad554b027afe1   144587:
 f1cb7c9b1782a65017362218912f9979c4f00c7a   144583:
 c6e6ef9bc217c9dbcaa92a0a16b656d75a30aac6   144575:
 5cac01f638025618f4286caac9c7c17978acd40d v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/net/bonding/bond_main.c | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index cddb22f4a944..7e4e9545781b 100644
--- 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
index 67515b78ff91..2188a96fc090 100644
--- 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: