Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge

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)
         if (!tp->pcie_cap && netif_msg_probe(tp))
                 dev_info(&pdev->dev, "no PCI Express capability\n");
 
-        /* Unneeded ? Don't mess with Mrs. Murphy. */
-        rtl8169_irq_mask_and_ack(ioaddr);
+        RTL_W16(IntrMask, 0x0000);
 
         /* Soft reset the chip. */
         RTL_W8(ChipCmd, CmdReset);
@@ -2088,6 +2087,8 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 msleep_interruptible(1);
         }
 
+        RTL_W16(IntrStatus, 0xffff);
+
         /* Identify chip attached to board */
         rtl8169_get_mac_version(tp, ioaddr);