--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -2595,7 +2595,8 @@ mt7531_setup_common(struct dsa_switch *d
    if (ret < 0)
        return ret;

-   return 0;
+   /* Setup VLAN ID 0 for VLAN-unaware bridges */
+   return mt7530_setup_vlan0(priv);
 }

 static int
@@ -2691,11 +2692,6 @@ mt7531_setup(struct dsa_switch *ds)
    if (ret)
        return ret;

-   /* Setup VLAN ID 0 for VLAN-unaware bridges */
-   ret = mt7530_setup_vlan0(priv);
-   if (ret)
-       return ret;
-
    ds->assisted_learning_on_cpu_port = true;
    ds->mtu_enforcement_ingress = true;