aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/sky2.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 744362272e2d..1593ed49e8fe 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -4859,10 +4859,11 @@ static int sky2_resume(struct pci_dev *pdev)
4859 pci_enable_wake(pdev, PCI_D0, 0); 4859 pci_enable_wake(pdev, PCI_D0, 0);
4860 4860
4861 /* Re-enable all clocks */ 4861 /* Re-enable all clocks */
4862 if (hw->chip_id == CHIP_ID_YUKON_EX || 4862 err = pci_write_config_dword(pdev, PCI_DEV_REG3, 0);
4863 hw->chip_id == CHIP_ID_YUKON_EC_U || 4863 if (err) {
4864 hw->chip_id == CHIP_ID_YUKON_FE_P) 4864 dev_err(&pdev->dev, "PCI write config failed\n");
4865 sky2_pci_write32(hw, PCI_DEV_REG3, 0); 4865 goto out;
4866 }
4866 4867
4867 sky2_reset(hw); 4868 sky2_reset(hw);
4868 sky2_write32(hw, B0_IMSK, Y2_IS_BASE); 4869 sky2_write32(hw, B0_IMSK, Y2_IS_BASE);