Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fe2cb32 authored by Adam Belay's avatar Adam Belay Committed by Jeff Garzik
Browse files

[PATCH] fix tulip suspend/resume #2 



This patch allows the tulip driver to suspend and resume properly.  It was
originally written by Karsten Keil and then modified by Adam Belay.

Signed-off-by: default avatarKarsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAdam Belay <abelay@novell.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
parent 05ab195c

drivers/net/tulip/tulip_core.c

+31 −12
Original line number Diff line number Diff line
@@ -1757,11 +1757,19 @@ static int tulip_suspend (struct pci_dev *pdev, pm_message_t state) 
{

	struct net_device *dev = pci_get_drvdata(pdev);



	if (dev && netif_running (dev) && netif_device_present (dev)) {

		netif_device_detach (dev);

	if (!dev)

		return -EINVAL;



	if (netif_running(dev))

		tulip_down(dev);

		/* pci_power_off(pdev, -1); */

	}



	netif_device_detach(dev);

	free_irq(dev->irq, dev);



	pci_save_state(pdev);

	pci_disable_device(pdev);

	pci_set_power_state(pdev, pci_choose_state(pdev, state));



	return 0;

}
@@ -1769,15 +1777,26 @@ static int tulip_suspend (struct pci_dev *pdev, pm_message_t state) 
static int tulip_resume(struct pci_dev *pdev)

{

	struct net_device *dev = pci_get_drvdata(pdev);

	int retval;



	if (!dev)

		return -EINVAL;



	pci_set_power_state(pdev, PCI_D0);

	pci_restore_state(pdev);



	if (dev && netif_running (dev) && !netif_device_present (dev)) {

#if 1

	pci_enable_device(pdev);

#endif

		/* pci_power_on(pdev); */

		tulip_up (dev);

		netif_device_attach (dev);



	if ((retval = request_irq(dev->irq, &tulip_interrupt, SA_SHIRQ, dev->name, dev))) {

		printk (KERN_ERR "tulip: request_irq failed in resume\n");

		return retval;

	}



	netif_device_attach(dev);



	if (netif_running(dev))

		tulip_up(dev);



	return 0;

}