diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/r8169.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 06c535222666..e1a638a05f86 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
@@ -2075,8 +2075,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
2075 | if (!tp->pcie_cap && netif_msg_probe(tp)) | 2075 | if (!tp->pcie_cap && netif_msg_probe(tp)) |
2076 | dev_info(&pdev->dev, "no PCI Express capability\n"); | 2076 | dev_info(&pdev->dev, "no PCI Express capability\n"); |
2077 | 2077 | ||
2078 | /* Unneeded ? Don't mess with Mrs. Murphy. */ | 2078 | RTL_W16(IntrMask, 0x0000); |
2079 | rtl8169_irq_mask_and_ack(ioaddr); | ||
2080 | 2079 | ||
2081 | /* Soft reset the chip. */ | 2080 | /* Soft reset the chip. */ |
2082 | RTL_W8(ChipCmd, CmdReset); | 2081 | RTL_W8(ChipCmd, CmdReset); |
@@ -2088,6 +2087,8 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
2088 | msleep_interruptible(1); | 2087 | msleep_interruptible(1); |
2089 | } | 2088 | } |
2090 | 2089 | ||
2090 | RTL_W16(IntrStatus, 0xffff); | ||
2091 | |||
2091 | /* Identify chip attached to board */ | 2092 | /* Identify chip attached to board */ |
2092 | rtl8169_get_mac_version(tp, ioaddr); | 2093 | rtl8169_get_mac_version(tp, ioaddr); |
2093 | 2094 | ||