diff options
author | Vladislav Zolotarov <vladz@broadcom.com> | 2011-01-08 21:20:19 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-09 18:47:39 -0500 |
commit | 084d6cbb13e351f48ecd87cc8718ace6b72845e8 (patch) | |
tree | 7b1a4029467e64318cd448a19a1f7c319eda6487 | |
parent | 4a33bc03ab66631e844080bf1189d2afd7aae929 (diff) |
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>
-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) | |||
9508 | /* Delete all NAPI objects */ | 9508 | /* Delete all NAPI objects */ |
9509 | bnx2x_del_all_napi(bp); | 9509 | bnx2x_del_all_napi(bp); |
9510 | 9510 | ||
9511 | /* Power on: we can't let PCI layer write to us while we are in D3 */ | ||
9512 | bnx2x_set_power_state(bp, PCI_D0); | ||
9513 | |||
9511 | /* Disable MSI/MSI-X */ | 9514 | /* Disable MSI/MSI-X */ |
9512 | bnx2x_disable_msi(bp); | 9515 | bnx2x_disable_msi(bp); |
9513 | 9516 | ||
9517 | /* Power off */ | ||
9518 | bnx2x_set_power_state(bp, PCI_D3hot); | ||
9519 | |||
9514 | /* Make sure RESET task is not scheduled before continuing */ | 9520 | /* Make sure RESET task is not scheduled before continuing */ |
9515 | cancel_delayed_work_sync(&bp->reset_task); | 9521 | cancel_delayed_work_sync(&bp->reset_task); |
9516 | 9522 | ||