1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 21022801a789..ae7548a5286e 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -703,6 +703,7 @@ static void i40e_free_vf_res(struct i40e_vf *vf)
          */
         vf->num_queue_pairs = 0;
         vf->vf_states = 0;
+        clear_bit(I40E_VF_STAT_INIT, &vf->vf_states);
 }
 
 /**
@@ -841,11 +842,11 @@ void i40e_reset_vf(struct i40e_vf *vf, bool flr)
 complete_reset:
         /* reallocate VF resources to reset the VSI state */
         i40e_free_vf_res(vf);
-        i40e_alloc_vf_res(vf);
-        i40e_enable_vf_mappings(vf);
-        set_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states);
-        clear_bit(I40E_VF_STAT_DISABLED, &vf->vf_states);
-
+        if (!i40e_alloc_vf_res(vf)) {
+                i40e_enable_vf_mappings(vf);
+                set_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states);
+                clear_bit(I40E_VF_STAT_DISABLED, &vf->vf_states);
+        }
         /* tell the VF the reset is done */
         wr32(hw, I40E_VFGEN_RSTAT1(vf->vf_id), I40E_VFR_VFACTIVE);
         i40e_flush(hw);