diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2005-09-06 15:16:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 16:57:16 -0700 |
| commit | 5b039e681b8c5f30aac9cc04385cc94be45d0823 (patch) | |
| tree | 8e5a1045b36849c9568677611e060221f49748ca /drivers/net | |
| parent | d7ae79c72d072e3208c18ff2dc402a69229b7b1b (diff) | |
| download | blackbird-op-linux-5b039e681b8c5f30aac9cc04385cc94be45d0823.tar.gz blackbird-op-linux-5b039e681b8c5f30aac9cc04385cc94be45d0823.zip | |
[PATCH] 3c59x PM fixes
This patch adds some missing pci-related calls to the suspend and resume
routines of the 3c59x driver. It also makes the driver free/request IRQ on
suspend/resume, in accordance with the proposal at:
http://lists.osdl.org/pipermail/linux-pm/2005-May/000955.html
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/3c59x.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index 07746b95fd83..de0dc4ab6e54 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c @@ -973,6 +973,11 @@ static int vortex_suspend (struct pci_dev *pdev, pm_message_t state) netif_device_detach(dev); vortex_down(dev, 1); } + pci_save_state(pdev); + pci_enable_wake(pdev, pci_choose_state(pdev, state), 0); + free_irq(dev->irq, dev); + pci_disable_device(pdev); + pci_set_power_state(pdev, pci_choose_state(pdev, state)); } return 0; } @@ -980,8 +985,19 @@ static int vortex_suspend (struct pci_dev *pdev, pm_message_t state) static int vortex_resume (struct pci_dev *pdev) { struct net_device *dev = pci_get_drvdata(pdev); + struct vortex_private *vp = netdev_priv(dev); - if (dev && dev->priv) { + if (dev && vp) { + pci_set_power_state(pdev, PCI_D0); + pci_restore_state(pdev); + pci_enable_device(pdev); + pci_set_master(pdev); + if (request_irq(dev->irq, vp->full_bus_master_rx ? + &boomerang_interrupt : &vortex_interrupt, SA_SHIRQ, dev->name, dev)) { + printk(KERN_WARNING "%s: Could not reserve IRQ %d\n", dev->name, dev->irq); + pci_disable_device(pdev); + return -EBUSY; + } if (netif_running(dev)) { vortex_up(dev); netif_device_attach(dev); |
