diff options
author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-06-19 13:40:09 (GMT) |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2015-02-13 22:21:15 (GMT) |
commit | 0f9c2e7e12ad391d1157d3a0be1bc08be7910516 (patch) | |
tree | d8d3a74a1e6a2d54809ee1eb043845ea0914a300 /drivers/net | |
parent | a7bb04e599dd691496b2b6ae179fc50db658e182 (diff) | |
download | linux-fsl-qoriq-0f9c2e7e12ad391d1157d3a0be1bc08be7910516.tar.xz |
Revert "drivers/net: tulip_remove_one needs to call pci_disable_device()"
This reverts commit 4a77edc195f0b03644e84dda00fcfe9827868e8e.
This commit was added to the -rt tree and submitted to stable. But because
the stable version inserted pci_disable_device() in a slightly different
location, when stable was merged it caused this to be duplicated.
Remove the version that was added to -rt and keep the stable one.
Link: http://lkml.kernel.org/r/1403149603.5189.10.camel@marge.simpson.net
Reported-by: Mike Galbraith <umgwanakikbuti@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/dec/tulip/tulip_core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c index a6d4653..7790160 100644 --- a/drivers/net/ethernet/dec/tulip/tulip_core.c +++ b/drivers/net/ethernet/dec/tulip/tulip_core.c @@ -1939,7 +1939,6 @@ static void tulip_remove_one(struct pci_dev *pdev) pci_iounmap(pdev, tp->base_addr); free_netdev (dev); pci_release_regions (pdev); - pci_disable_device(pdev); pci_set_drvdata (pdev, NULL); pci_disable_device(pdev); |