diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-01 22:33:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-01 22:51:30 -0700 |
| commit | dda922c831d1661c11a3ae1051b7160236f6ffb0 (patch) | |
| tree | 2fe588dbc4dc90addaabf303713fb2c6af0dc19b /net/dsa | |
| parent | db3397b9aa30d334be237170e048dcd96e1e951d (diff) | |
| parent | c46a024ea5eb0165114dbbc8c82c29b7bcf66e71 (diff) | |
| download | op-kernel-dev-dda922c831d1661c11a3ae1051b7160236f6ffb0.zip op-kernel-dev-dda922c831d1661c11a3ae1051b7160236f6ffb0.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/phy/amd-xgbe-phy.c
drivers/net/wireless/iwlwifi/Kconfig
include/net/mac80211.h
iwlwifi/Kconfig and mac80211.h were both trivial overlapping
changes.
The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and
the bug fix that happened on the 'net' side is already integrated
into the rest of the amd-xgbe driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/dsa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index e6f6cc3..392e29a 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -359,7 +359,7 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index, */ ds = kzalloc(sizeof(*ds) + drv->priv_size, GFP_KERNEL); if (ds == NULL) - return NULL; + return ERR_PTR(-ENOMEM); ds->dst = dst; ds->index = index; @@ -370,7 +370,7 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index, ret = dsa_switch_setup_one(ds, parent); if (ret) - return NULL; + return ERR_PTR(ret); return ds; } |
