Commit 4637a467 authored by Li Shaohua's avatar Li Shaohua Committed by Linus Torvalds

[PATCH] eepro100 resume failure

Fix eepro100 driver suspend/resume issue.

Signed-off-by: Li Shaohua<shaohua.li@intel.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent dd50541f
...@@ -2328,6 +2328,8 @@ static int eepro100_suspend(struct pci_dev *pdev, u32 state) ...@@ -2328,6 +2328,8 @@ static int eepro100_suspend(struct pci_dev *pdev, u32 state)
outl(PortPartialReset, ioaddr + SCBPort); outl(PortPartialReset, ioaddr + SCBPort);
/* XXX call pci_set_power_state ()? */ /* XXX call pci_set_power_state ()? */
pci_disable_device(pdev);
pci_set_power_state (pdev, 3);
return 0; return 0;
} }
...@@ -2337,7 +2339,10 @@ static int eepro100_resume(struct pci_dev *pdev) ...@@ -2337,7 +2339,10 @@ static int eepro100_resume(struct pci_dev *pdev)
struct speedo_private *sp = netdev_priv(dev); struct speedo_private *sp = netdev_priv(dev);
long ioaddr = dev->base_addr; long ioaddr = dev->base_addr;
pci_set_power_state(pdev, 0);
pci_restore_state(pdev); pci_restore_state(pdev);
pci_enable_device(pdev);
pci_set_master(pdev);
if (!netif_running(dev)) if (!netif_running(dev))
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment