aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/tulip/de2104x.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 9d6b7e9c7a6b..a0be7c28c587 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -1231,6 +1231,7 @@ static void de_adapter_sleep (struct de_private *de)
1231 if (de->de21040) 1231 if (de->de21040)
1232 return; 1232 return;
1233 1233
1234 dw32(CSR13, 0); /* Reset phy */
1234 pci_read_config_dword(de->pdev, PCIPM, &pmctl); 1235 pci_read_config_dword(de->pdev, PCIPM, &pmctl);
1235 pmctl |= PM_Sleep; 1236 pmctl |= PM_Sleep;
1236 pci_write_config_dword(de->pdev, PCIPM, pmctl); 1237 pci_write_config_dword(de->pdev, PCIPM, pmctl);
@@ -2166,6 +2167,8 @@ static int de_resume (struct pci_dev *pdev)
2166 dev_err(&dev->dev, "pci_enable_device failed in resume\n"); 2167 dev_err(&dev->dev, "pci_enable_device failed in resume\n");
2167 goto out; 2168 goto out;
2168 } 2169 }
2170 pci_set_master(pdev);
2171 de_init_rings(de);
2169 de_init_hw(de); 2172 de_init_hw(de);
2170out_attach: 2173out_attach:
2171 netif_device_attach(dev); 2174 netif_device_attach(dev);