diff options
| author | David S. Miller <davem@davemloft.net> | 2016-12-07 03:33:19 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-07 03:33:19 +0100 |
| commit | c63d352f053a788281eb90df0a71cd3a6b2c4040 (patch) | |
| tree | ce0c6f0993100d3d8feda1d9d487dfba4abc5bd0 /net/bridge | |
| parent | net: hns: Fix to conditionally convey RX checksum flag to stack (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
| download | linux-c63d352f053a788281eb90df0a71cd3a6b2c4040.tar.xz linux-c63d352f053a788281eb90df0a71cd3a6b2c4040.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_sysfs_br.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c index c9d2e0abfb89..a18148213b08 100644 --- a/net/bridge/br_sysfs_br.c +++ b/net/bridge/br_sysfs_br.c @@ -938,6 +938,7 @@ int br_sysfs_addbr(struct net_device *dev) if (!br->ifobj) { pr_info("%s: can't add kobject (directory) %s/%s\n", __func__, dev->name, SYSFS_BRIDGE_PORT_SUBDIR); + err = -ENOMEM; goto out3; } return 0; |