2 files changed, 7 insertions, 6 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 897452d72d71..628e917f5338 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -8181,16 +8181,16 @@ static void i40e_remove(struct pci_dev *pdev)
 
         i40e_ptp_stop(pf);
 
-        if (pf->flags & I40E_FLAG_SRIOV_ENABLED) {
-                i40e_free_vfs(pf);
-                pf->flags &= ~I40E_FLAG_SRIOV_ENABLED;
-        }
-
         /* no more scheduling of any task */
         set_bit(__I40E_DOWN, &pf->state);
         del_timer_sync(&pf->service_timer);
         cancel_work_sync(&pf->service_task);
 
+        if (pf->flags & I40E_FLAG_SRIOV_ENABLED) {
+                i40e_free_vfs(pf);
+                pf->flags &= ~I40E_FLAG_SRIOV_ENABLED;
+        }
+
         i40e_fdir_teardown(pf);
 
         /* If there is a switch structure or any orphans, remove them.
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 9074f63a2447..7d133faad4cf 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -1868,7 +1868,8 @@ int i40e_vc_process_vflr_event(struct i40e_pf *pf)
                         /* clear the bit in GLGEN_VFLRSTAT */
                         wr32(hw, I40E_GLGEN_VFLRSTAT(reg_idx), (1 << bit_idx));
 
-                        i40e_reset_vf(vf, true);
+                        if (!test_bit(__I40E_DOWN, &pf->state))
+                                i40e_reset_vf(vf, true);
                 }
         }