1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index fcd815dc7d3c..25242f505161 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -1393,6 +1393,9 @@ static int i40e_eeprom_test(struct net_device *netdev, u64 *data)
         netif_info(pf, hw, netdev, "eeprom test\n");
         *data = i40e_diag_eeprom_test(&pf->hw);
 
+        /* forcebly clear the NVM Update state machine */
+        pf->hw.nvmupd_state = I40E_NVMUPD_STATE_INIT;
+
         return *data;
 }