View | Details | Raw Unified | Return to bug 115814
Collapse All | Expand All

(-)linux/drivers/net/r8169.c~ (+18 lines)
Lines 1635-1640 Link Here
1635
	tp->stats.rx_missed_errors += RTL_R32(RxMissed);
1635
	tp->stats.rx_missed_errors += RTL_R32(RxMissed);
1636
	RTL_W32(RxMissed, 0);
1636
	RTL_W32(RxMissed, 0);
1637
	spin_unlock_irqrestore(&tp->lock, flags);
1637
	spin_unlock_irqrestore(&tp->lock, flags);
1638
1639
	free_irq(dev->irq, dev);
1640
	pci_save_state(pdev);
1641
	pci_disable_device(pdev);
1642
	pci_set_power_state(pdev, pci_choose_state(pdev, state));
1638
	
1643
	
1639
	return 0;
1644
	return 0;
1640
}
1645
}
Lines 1642-1647 Link Here
1642
static int rtl8169_resume(struct pci_dev *pdev)
1647
static int rtl8169_resume(struct pci_dev *pdev)
1643
{
1648
{
1644
	struct net_device *dev = pci_get_drvdata(pdev);
1649
	struct net_device *dev = pci_get_drvdata(pdev);
1650
	int retval;
1651
1652
	if (!dev)
1653
		return -EINVAL;
1654
1655
	pci_set_power_state(pdev, PCI_D0);
1656
	pci_restore_state(pdev);
1657
	pci_enable_device(pdev);
1658
1659
	if ((retval = request_irq(dev->irq, rtl8169_interrupt, SA_SHIRQ, dev->name, dev))) {
1660
		printk (KERN_ERR "r8169: request_irq failed in resume error %d\n", retval);
1661
		return retval;
1662
	}
1645
1663
1646
	if (!netif_running(dev))
1664
	if (!netif_running(dev))
1647
	    return 0;
1665
	    return 0;

Return to bug 115814