From cb487cdeb54a3681d90af9b728fc2f64dc6f673a Mon Sep 17 00:00:00 2001 From: Maxim Levitsky Date: Fri, 23 Nov 2007 01:30:15 +0200 Subject: [PATCH] --- yaml --- r: 74453 b: refs/heads/master c: 65809b5125d61e0c8a7f6c0a5431450eaf853820 h: refs/heads/master i: 74451: 90e8e7ec84776e3c3d514582789504253f67c600 v: v3 --- [refs] | 2 +- trunk/drivers/net/tulip/dmfe.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9df9de0b77bb..18a2e58926d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b31f7ffa9ed7ba5fbe1cab8fb17a8c545e6a0eb +refs/heads/master: 65809b5125d61e0c8a7f6c0a5431450eaf853820 diff --git a/trunk/drivers/net/tulip/dmfe.c b/trunk/drivers/net/tulip/dmfe.c index ca90566d5bcd..208dae745257 100644 --- a/trunk/drivers/net/tulip/dmfe.c +++ b/trunk/drivers/net/tulip/dmfe.c @@ -2118,8 +2118,8 @@ static int dmfe_suspend(struct pci_dev *pci_dev, pm_message_t state) pci_enable_wake(pci_dev, PCI_D3cold, 1); /* Power down device*/ - pci_set_power_state(pci_dev, pci_choose_state (pci_dev,state)); pci_save_state(pci_dev); + pci_set_power_state(pci_dev, pci_choose_state (pci_dev,state)); return 0; } @@ -2129,8 +2129,8 @@ static int dmfe_resume(struct pci_dev *pci_dev) struct net_device *dev = pci_get_drvdata(pci_dev); u32 tmp; - pci_restore_state(pci_dev); pci_set_power_state(pci_dev, PCI_D0); + pci_restore_state(pci_dev); /* Re-initilize DM910X board */ dmfe_init_dm910x(dev);