From 62b34eabcf38ac25aea2e3c1bd3af2e26d87481e Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Thu, 11 Jun 2009 05:46:04 -0700
Subject: [PATCH] --- yaml --- r: 150848 b: refs/heads/master c:
 130aa61a77b8518f1ea618e1b7d214d60b405f10 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/net/bonding/bond_sysfs.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e15c5757d4db..77313d4d2c08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ef12d98a19254ee5dc851bd83e214b43ec1f725
+refs/heads/master: 130aa61a77b8518f1ea618e1b7d214d60b405f10
diff --git a/trunk/drivers/net/bonding/bond_sysfs.c b/trunk/drivers/net/bonding/bond_sysfs.c
index 3a1b7b04eb79..5fb861a08664 100644
--- a/trunk/drivers/net/bonding/bond_sysfs.c
+++ b/trunk/drivers/net/bonding/bond_sysfs.c
@@ -1541,6 +1541,7 @@ int bond_create_sysfs(void)
 			printk(KERN_ERR
 			       "network device named %s already exists in sysfs",
 			       class_attr_bonding_masters.attr.name);
+		ret = 0;
 	}
 
 	return ret;