1 files changed, 3 insertions, 7 deletions

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 2173402d87e0..fc1813140be6 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -314,19 +314,15 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index,
          * Create network devices for physical switch ports.
          */
         for (i = 0; i < DSA_MAX_PORTS; i++) {
-                struct net_device *slave_dev;
-
                 if (!(ds->phys_port_mask & (1 << i)))
                         continue;
 
-                slave_dev = dsa_slave_create(ds, parent, i, pd->port_names[i]);
-                if (slave_dev == NULL) {
+                ret = dsa_slave_create(ds, parent, i, pd->port_names[i]);
+                if (ret < 0) {
                         netdev_err(dst->master_netdev, "[%d]: can't create dsa slave device for port %d(%s)\n",
                                    index, i, pd->port_names[i]);
-                        continue;
+                        ret = 0;
                 }
-
-                ds->ports[i] = slave_dev;
         }
 
 #ifdef CONFIG_NET_DSA_HWMON