---

yaml --- r: 361850 b: refs/heads/master c: 9fe16b7 h: refs/heads/master v: v3
git-mirror · Mar 26, 2013 · 9e30e36 · 9e30e36
1 parent 6707c76
commit 9e30e36
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14134f6584212d585b310ce95428014b653dfaf6
+refs/heads/master: 9fe16b78ee17579cb4f333534cf7043e94c67024
diff --git a/trunk/drivers/net/bonding/bond_sysfs.c b/trunk/drivers/net/bonding/bond_sysfs.c
@@ -183,6 +183,11 @@ int bond_create_slave_symlinks(struct net_device *master,
 	sprintf(linkname, "slave_%s", slave->name);
 	ret = sysfs_create_link(&(master->dev.kobj), &(slave->dev.kobj),
 				linkname);
+
+	/* free the master link created earlier in case of error */
+	if (ret)
+		sysfs_remove_link(&(slave->dev.kobj), "master");
+
 	return ret;
 
 }