diff options
author | Vladislav Zolotarov <vladz@broadcom.com> | 2011-01-09 02:20:19 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-09 15:47:39 -0800 |
commit | 084d6cbb13e351f48ecd87cc8718ace6b72845e8 (patch) | |
tree | 7b1a4029467e64318cd448a19a1f7c319eda6487 /drivers | |
parent | 4a33bc03ab66631e844080bf1189d2afd7aae929 (diff) | |
download | linux-stable-084d6cbb13e351f48ecd87cc8718ace6b72845e8.tar.gz linux-stable-084d6cbb13e351f48ecd87cc8718ace6b72845e8.tar.bz2 linux-stable-084d6cbb13e351f48ecd87cc8718ace6b72845e8.zip |
bnx2x: Move to D0 before clearing MSI/MSI-X configuration.
Move to D0 before clearing MSI/MSI-X configuration. Otherwise MSI/MSI-X
won't be cleared.
Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/bnx2x/bnx2x_main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c index b5558bc7223d..84e1af4d65e1 100644 --- a/drivers/net/bnx2x/bnx2x_main.c +++ b/drivers/net/bnx2x/bnx2x_main.c @@ -9508,9 +9508,15 @@ static void __devexit bnx2x_remove_one(struct pci_dev *pdev) /* Delete all NAPI objects */ bnx2x_del_all_napi(bp); + /* Power on: we can't let PCI layer write to us while we are in D3 */ + bnx2x_set_power_state(bp, PCI_D0); + /* Disable MSI/MSI-X */ bnx2x_disable_msi(bp); + /* Power off */ + bnx2x_set_power_state(bp, PCI_D3hot); + /* Make sure RESET task is not scheduled before continuing */ cancel_delayed_work_sync(&bp->reset_task); |