From f2fde435e23731cbc2ea653b74478125da8fa4b3 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Wed, 12 Dec 2007 16:30:42 -0800 Subject: [PATCH] --- yaml --- r: 75017 b: refs/heads/master c: 8543da6672b0994921f014f2250e27ae81645580 h: refs/heads/master i: 75015: 1e7cbd6374a241935e43d8135403830dbf127ab9 v: v3 --- [refs] | 2 +- trunk/drivers/net/e100.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 26a5e34198ba..182bfecd39ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 813820b9b9adb98d4ad3cd7434eb662b0fc15684 +refs/heads/master: 8543da6672b0994921f014f2250e27ae81645580 diff --git a/trunk/drivers/net/e100.c b/trunk/drivers/net/e100.c index e1c8a0d023ea..2b06e4b4dabc 100644 --- a/trunk/drivers/net/e100.c +++ b/trunk/drivers/net/e100.c @@ -2737,8 +2737,9 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state) pci_enable_wake(pdev, PCI_D3cold, 0); } - pci_disable_device(pdev); free_irq(pdev->irq, netdev); + + pci_disable_device(pdev); pci_set_power_state(pdev, PCI_D3hot); return 0; @@ -2780,6 +2781,8 @@ static void e100_shutdown(struct pci_dev *pdev) pci_enable_wake(pdev, PCI_D3cold, 0); } + free_irq(pdev->irq, netdev); + pci_disable_device(pdev); pci_set_power_state(pdev, PCI_D3hot); }