diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-10-30 10:30:09 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-10-30 10:30:09 +0100 |
commit | e17bae3266cc3d828003bdf78b5aa019db3ffa95 (patch) | |
tree | a73f200ba68bea7915b25e1a077c3f43c9183bdc /net/dsa/dsa2.c | |
parent | 773dd2fca581b0a80e5a33332cc8ee67e5a79cba (diff) | |
parent | 0b07194bb55ed836c2cc7c22e866b87a14681984 (diff) | |
download | linux-e17bae3266cc3d828003bdf78b5aa019db3ffa95.tar.gz |
Merge tag 'v4.14-rc7' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/dsa/dsa2.c')
-rw-r--r-- | net/dsa/dsa2.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index 873af0108e24..045d8a176279 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -496,14 +496,15 @@ static int dsa_cpu_parse(struct dsa_port *port, u32 index, if (!ethernet) return -EINVAL; ethernet_dev = of_find_net_device_by_node(ethernet); + if (!ethernet_dev) + return -EPROBE_DEFER; } else { ethernet_dev = dsa_dev_to_net_device(ds->cd->netdev[index]); + if (!ethernet_dev) + return -EPROBE_DEFER; dev_put(ethernet_dev); } - if (!ethernet_dev) - return -EPROBE_DEFER; - if (!dst->cpu_dp) { dst->cpu_dp = port; dst->cpu_dp->netdev = ethernet_dev; |