diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-06-19 09:40:09 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-06-19 09:40:09 -0400 |
| commit | ac5f82b87f263662458f7c9822d2483523cfaaa9 (patch) | |
| tree | 6d490c71b73de5381ff63de0cb1ea42e413915c7 | |
| parent | 4baf645b5bfe1bc83f21e6b0cdcacb411a1e5f15 (diff) | |
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>
| -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 a6d4653ebbc3..779016068a82 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); |