aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorHenry Tieman <henry.w.tieman@intel.com>2019-08-02 01:25:24 -0700
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2019-08-26 23:54:29 -0700
commitae2bdbb45d38ee2ec67a958bf221138b58817c82 (patch)
tree99830a82cc80216c941a5706a3e1cccc9a478747 /drivers/net
parentice: Rework ice_ena_msix_range (diff)
downloadlinux-dev-ae2bdbb45d38ee2ec67a958bf221138b58817c82.tar.xz
linux-dev-ae2bdbb45d38ee2ec67a958bf221138b58817c82.zip
ice: fix adminq calls during remove
The order of operations was incorrect in ice_remove(). The code would try to use adminq operations after the adminq was disabled. This caused all adminq calls to fail and possibly timeout waiting. Signed-off-by: Henry Tieman <henry.w.tieman@intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/intel/ice/ice_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 9371148dc489..f029aee32913 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -2633,9 +2633,9 @@ static void ice_remove(struct pci_dev *pdev)
continue;
ice_vsi_free_q_vectors(pf->vsi[i]);
}
- ice_clear_interrupt_scheme(pf);
ice_deinit_pf(pf);
ice_deinit_hw(&pf->hw);
+ ice_clear_interrupt_scheme(pf);
pci_disable_pcie_error_reporting(pdev);
}