mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
de2104x: fix power management
At least my 21041 cards come out of suspend with bus mastering disabled so they did not work after resume(no data transferred). After adding pci_set_master(), the driver oopsed immediately on resume - because de_clean_rings() is called on suspend but de_init_rings() call was missing in resume. Also disable link (reset SIA) before sleep (de4x5 does this too). Signed-off-by: Ondrej Zary <[email protected]> Acked-by: Jeff Garzik <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
e0f9c4f332
commit
b0255a0235
1 changed files with 3 additions and 0 deletions
|
|
@ -1231,6 +1231,7 @@ static void de_adapter_sleep (struct de_private *de)
|
|||
if (de->de21040)
|
||||
return;
|
||||
|
||||
dw32(CSR13, 0); /* Reset phy */
|
||||
pci_read_config_dword(de->pdev, PCIPM, &pmctl);
|
||||
pmctl |= PM_Sleep;
|
||||
pci_write_config_dword(de->pdev, PCIPM, pmctl);
|
||||
|
|
@ -2166,6 +2167,8 @@ static int de_resume (struct pci_dev *pdev)
|
|||
dev_err(&dev->dev, "pci_enable_device failed in resume\n");
|
||||
goto out;
|
||||
}
|
||||
pci_set_master(pdev);
|
||||
de_init_rings(de);
|
||||
de_init_hw(de);
|
||||
out_attach:
|
||||
netif_device_attach(dev);
|
||||
|
|
|
|||
Loading…
Reference in a new issue