diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-16 15:12:58 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-16 15:12:58 +0100 |
| commit | 99f4aafa139ea9f6e0eebecbddb3c9a216853e81 (patch) | |
| tree | 97443484018f991c3ca98299075417476ebcc4c8 /drivers/net | |
| parent | 9b6c8c0aa005554673b1a95f5ae8db72f60a589b (diff) | |
| parent | 9c432ede2cb016b2a98902a8b3aa1f8f26f29ee4 (diff) | |
| download | barebox-99f4aafa139ea9f6e0eebecbddb3c9a216853e81.tar.gz barebox-99f4aafa139ea9f6e0eebecbddb3c9a216853e81.tar.xz | |
Merge branch 'for-next/misc' into next
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/dsa.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/dsa.c b/drivers/net/dsa.c index 793bbbb4f1..6a3b829e15 100644 --- a/drivers/net/dsa.c +++ b/drivers/net/dsa.c @@ -400,8 +400,11 @@ static int dsa_switch_parse_ports_of(struct dsa_switch *ds, } master = of_parse_phandle(port, "ethernet", 0); - if (master) - dsa_switch_register_master(ds, port, master, reg); + if (master) { + ret = dsa_switch_register_master(ds, port, master, reg); + if (ret) + return ret; + } } /* Now we can register regular switch ports */ |