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

sky2: resume clocks

Browse Source 
Change the resume path to use pci write config for a couple of reasons:
1. pci_write_config_dword() allows for more error
   checking of PCI health after resume.

2. better to toggle this register on all chip types, since that
   is what vendor driver does.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
stephen hemminger 2010-02-07 06:23:53 +00:00 committed by David S. Miller
parent bd011e8826
commit a0db28b898
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/sky2.c
View File

@ -4859,10 +4859,11 @@ static int sky2_resume(struct pci_dev *pdev)
pci_enable_wake(pdev, PCI_D0, 0); pci_enable_wake(pdev, PCI_D0, 0);
/* Re-enable all clocks */ /* Re-enable all clocks */
if (hw->chip_id == CHIP_ID_YUKON_EX || err = pci_write_config_dword(pdev, PCI_DEV_REG3, 0);
hw->chip_id == CHIP_ID_YUKON_EC_U || if (err) {
hw->chip_id == CHIP_ID_YUKON_FE_P) dev_err(&pdev->dev, "PCI write config failed\n");
sky2_pci_write32(hw, PCI_DEV_REG3, 0); goto out;
}
sky2_reset(hw); sky2_reset(hw);
sky2_write32(hw, B0_IMSK, Y2_IS_BASE); sky2_write32(hw, B0_IMSK, Y2_IS_BASE);