summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-04-06 15:42:45 -0400
committerDavid S. Miller <davem@davemloft.net>2016-04-06 15:42:45 -0400
commit32fa270c8a3939a9c6cbcf8bc18a0db83a3b40d4 (patch)
tree19e0c1bdb7defac532736d9eff231b86b266af09 /net
parent529927f952c55f399823fc500e8ea6cac47b7fbf (diff)
downloadlinux-stable-32fa270c8a3939a9c6cbcf8bc18a0db83a3b40d4.tar.gz
linux-stable-32fa270c8a3939a9c6cbcf8bc18a0db83a3b40d4.tar.bz2
linux-stable-32fa270c8a3939a9c6cbcf8bc18a0db83a3b40d4.zip
Revert "bridge: Fix incorrect variable assignment on error path in br_sysfs_addbr"
This reverts commit c862cc9b70526a71d07e7bd86d9b61d1c792cead. Patch lacks a real-name Signed-off-by. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/bridge/br_sysfs_br.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index f4d40edbe8a9..6b8091407ca3 100644
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -870,7 +870,6 @@ int br_sysfs_addbr(struct net_device *dev)
br->ifobj = kobject_create_and_add(SYSFS_BRIDGE_PORT_SUBDIR, brobj);
if (!br->ifobj) {
- err = -EINVAL;
pr_info("%s: can't add kobject (directory) %s/%s\n",
__func__, dev->name, SYSFS_BRIDGE_PORT_SUBDIR);
goto out3;