Merge remote-tracking branches 'asoc/fix/rt5640' and 'asoc/fix/wm8962' into asoc...

[deliverable/linux.git] / net / bridge / br_sysfs_br.c

diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index f4d40edbe8a97dc5a3d533c028776d17ee4fa77c..6b8091407ca3126b333c76c5104f5a8ca6803e49 100644 (file)
--- 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;