Message ID | 1390835518-29652-1-git-send-email-yuvalmin@broadcom.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Yuval Mintz <yuvalmin@broadcom.com> Date: Mon, 27 Jan 2014 17:11:58 +0200 > Submission d9aee59 "bnx2x: Don't release PCI bars on shutdown" separated > the PCI remove and shutdown flows, but pci_disable_device() is still > being called on both. > As a result, a dev_WARN_ONCE will be hit during shutdown for every bnx2x > VF probed on a hypervisor (as its shutdown callback will be called and later > pci_disable_sriov() will call its remove callback). > > This calls the pci_disable_device() only on the remove flow. > > Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com> > Signed-off-by: Ariel Elior <ariele@broadcom.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index e118a3e..c9c445e 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -13102,9 +13102,9 @@ static void __bnx2x_remove(struct pci_dev *pdev, if (atomic_read(&pdev->enable_cnt) == 1) pci_release_regions(pdev); - } - pci_disable_device(pdev); + pci_disable_device(pdev); + } } static void bnx2x_remove_one(struct pci_dev *pdev)