mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
[ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc...
Signed-off-by: Len Brown <[email protected]>
This commit is contained in:
commit
5028770a42
198 changed files with 7755 additions and 5428 deletions
|
|
@ -1930,6 +1930,7 @@ static int b44_suspend(struct pci_dev *pdev, pm_message_t state)
|
|||
b44_free_rings(bp);
|
||||
|
||||
spin_unlock_irq(&bp->lock);
|
||||
pci_disable_device(pdev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1939,6 +1940,8 @@ static int b44_resume(struct pci_dev *pdev)
|
|||
struct b44 *bp = netdev_priv(dev);
|
||||
|
||||
pci_restore_state(pdev);
|
||||
pci_enable_device(pdev);
|
||||
pci_set_master(pdev);
|
||||
|
||||
if (!netif_running(dev))
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -660,6 +660,7 @@ static int ne2k_pci_suspend (struct pci_dev *pdev, pm_message_t state)
|
|||
|
||||
netif_device_detach(dev);
|
||||
pci_save_state(pdev);
|
||||
pci_disable_device(pdev);
|
||||
pci_set_power_state(pdev, pci_choose_state(pdev, state));
|
||||
|
||||
return 0;
|
||||
|
|
@ -671,6 +672,8 @@ static int ne2k_pci_resume (struct pci_dev *pdev)
|
|||
|
||||
pci_set_power_state(pdev, 0);
|
||||
pci_restore_state(pdev);
|
||||
pci_enable_device(pdev);
|
||||
pci_set_master(pdev);
|
||||
NS8390_init(dev, 1);
|
||||
netif_device_attach(dev);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue