diff options
| author | Julia Cartwright <julia@ni.com> | 2018-01-15 13:09:37 -0600 |
|---|---|---|
| committer | Julia Cartwright <julia@ni.com> | 2018-01-15 13:09:37 -0600 |
| commit | 223a1a424ccc1a22fa77500bb1bced246d5dd855 (patch) | |
| tree | 35a62e7275ac840c7b20faa8cc40fe9798bcc950 /drivers/net/ethernet/mellanox/mlx5/core/main.c | |
| parent | 0c37397b6b8708f3cae24a8faeed2d1c84760892 (diff) | |
| parent | 7bbc6ca4887794cc44b41412a35bdfbe0cbd1c50 (diff) | |
Merge tag 'v4.9.76' into v4.9-rt
This is the 4.9.76 stable release
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/main.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index b3309f2ed7dc..981cd1d84a5b 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -1283,6 +1283,7 @@ static int init_one(struct pci_dev *pdev, if (err) goto clean_load; + pci_save_state(pdev); return 0; clean_load: @@ -1331,9 +1332,8 @@ static pci_ers_result_t mlx5_pci_err_detected(struct pci_dev *pdev, mlx5_enter_error_state(dev); mlx5_unload_one(dev, priv, false); - /* In case of kernel call save the pci state and drain the health wq */ + /* In case of kernel call drain the health wq */ if (state) { - pci_save_state(pdev); mlx5_drain_health_wq(dev); mlx5_pci_disable_device(dev); } @@ -1385,6 +1385,7 @@ static pci_ers_result_t mlx5_pci_slot_reset(struct pci_dev *pdev) pci_set_master(pdev); pci_restore_state(pdev); + pci_save_state(pdev); if (wait_vital(pdev)) { dev_err(&pdev->dev, "%s: wait_vital timed out\n", __func__); |