Patchwork [net-next] cxgb4: remove a bogus PCI function number check

login
register
mail settings
Submitter Dimitris Michailidis
Date Sept. 30, 2010, 7:17 p.m.
Message ID <1285874232-1554-1-git-send-email-dm@chelsio.com>
Download mbox | patch
Permalink /patch/66239/
State Accepted
Delegated to: David Miller
Headers show

Comments

Dimitris Michailidis - Sept. 30, 2010, 7:17 p.m.
Remove a bogus PCI function number check from the driver's .remove
method that causes pci_release_regions not to be called for function 0
if additional functions are attached and one of them is used as primary.

Signed-off-by: Dimitris Michailidis <dm@chelsio.com>
---
 drivers/net/cxgb4/cxgb4_main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
David Miller - Oct. 4, 2010, 5:07 a.m.
From: Dimitris Michailidis <dm@chelsio.com>
Date: Thu, 30 Sep 2010 12:17:12 -0700

> Remove a bogus PCI function number check from the driver's .remove
> method that causes pci_release_regions not to be called for function 0
> if additional functions are attached and one of them is used as primary.
> 
> Signed-off-by: Dimitris Michailidis <dm@chelsio.com>

Applied, thanks.
--
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

Patch

diff --git a/drivers/net/cxgb4/cxgb4_main.c b/drivers/net/cxgb4/cxgb4_main.c
index 4fb08e3..22169a7 100644
--- a/drivers/net/cxgb4/cxgb4_main.c
+++ b/drivers/net/cxgb4/cxgb4_main.c
@@ -3863,7 +3863,7 @@  static void __devexit remove_one(struct pci_dev *pdev)
 		pci_disable_device(pdev);
 		pci_release_regions(pdev);
 		pci_set_drvdata(pdev, NULL);
-	} else if (PCI_FUNC(pdev->devfn) > 0)
+	} else
 		pci_release_regions(pdev);
 }