3 files changed, 10 insertions, 7 deletions

diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.c b/drivers/net/ethernet/stmicro/stmmac/hwif.c
index 14770fc8865e..1f50e83cafb2 100644
--- a/drivers/net/ethernet/stmicro/stmmac/hwif.c
+++ b/drivers/net/ethernet/stmicro/stmmac/hwif.c
@@ -252,13 +252,8 @@ int stmmac_hwif_init(struct stmmac_priv *priv)
                                 return ret;
                 }
 
-                /* Run quirks, if needed */
-                if (entry->quirks) {
-                        ret = entry->quirks(priv);
-                        if (ret)
-                                return ret;
-                }
-
+                /* Save quirks, if needed for posterior use */
+                priv->hwif_quirks = entry->quirks;
                 return 0;
         }
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index 025efbf6145c..76649adf8fb0 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -129,6 +129,7 @@ struct stmmac_priv {
         struct net_device *dev;
         struct device *device;
         struct mac_device_info *hw;
+        int (*hwif_quirks)(struct stmmac_priv *priv);
         struct mutex lock;
 
         /* RX Queue */
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 5e6d4fe2f4ef..e79b0d7b388a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -4135,6 +4135,13 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
         if (priv->dma_cap.tsoen)
                 dev_info(priv->device, "TSO supported\n");
 
+        /* Run HW quirks, if any */
+        if (priv->hwif_quirks) {
+                ret = priv->hwif_quirks(priv);
+                if (ret)
+                        return ret;
+        }
+
         return 0;
 }