Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 07:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[netdrvr] tulip: oops in tulip_interrupt when hibernating with swsusp/suspend2

Browse Source 
The following patch is seems to fix the tulip suspend/resume panic:
	http://bugzilla.kernel.org/show_bug.cgi?id=8952#c46

My attempts at a cleaner patch failed and Pavel thinks this is OK.

Original from:  kernelbugs@tap.homeip.net
Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Grant Grundler 2008-05-12 00:37:51 -06:00 committed by Jeff Garzik
parent aefdbf1a3b
commit 56997fa838
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/tulip/tulip_core.c
View File

@ -1729,12 +1729,15 @@ static int tulip_suspend (struct pci_dev *pdev, pm_message_t state)
if (!dev) if (!dev)
return -EINVAL; return -EINVAL;
if (netif_running(dev)) if (!netif_running(dev))
tulip_down(dev); goto save_state;
tulip_down(dev);
netif_device_detach(dev); netif_device_detach(dev);
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
save_state:
pci_save_state(pdev); pci_save_state(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
pci_set_power_state(pdev, pci_choose_state(pdev, state)); pci_set_power_state(pdev, pci_choose_state(pdev, state));
@ -1754,6 +1757,9 @@ static int tulip_resume(struct pci_dev *pdev)
pci_set_power_state(pdev, PCI_D0); pci_set_power_state(pdev, PCI_D0);
pci_restore_state(pdev); pci_restore_state(pdev);
if (!netif_running(dev))
return 0;
if ((retval = pci_enable_device(pdev))) { if ((retval = pci_enable_device(pdev))) {
printk (KERN_ERR "tulip: pci_enable_device failed in resume\n"); printk (KERN_ERR "tulip: pci_enable_device failed in resume\n");
return retval; return retval;