Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / drivers / net / ethernet / realtek / r8169.c

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 630409e0337fbaf7b98bb23e578c85b2aceae30b..604ae78381ae4fdd28836e3cdca589da450c73a9 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -8378,12 +8378,12 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (!tp->counters)
                return -ENOMEM;
 
+       pci_set_drvdata(pdev, dev);
+
        rc = register_netdev(dev);
        if (rc < 0)
                return rc;
 
-       pci_set_drvdata(pdev, dev);
-
        netif_info(tp, probe, dev, "%s at 0x%p, %pM, XID %08x IRQ %d\n",
                   rtl_chip_infos[chipset].name, tp->mmio_addr, dev->dev_addr,
                   (u32)(RTL_R32(tp, TxConfig) & 0x9cf0f8ff),