[PATCH] e100: e100_eeprom_load was called after e100_phy_init

[firefly-linux-kernel-4.4.55.git] / drivers / net / e100.c

diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 7e46d038b9f880469d18c0da7f7976ffc1c18137..8c7e2d17e75f1e048d564fe5f272744a9081effc 100644 (file)
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2340,11 +2340,11 @@ static int __devinit e100_probe(struct pci_dev *pdev,
                goto err_out_iounmap;
        }
 
-       e100_phy_init(nic);
-
        if((err = e100_eeprom_load(nic)))
                goto err_out_free;
 
+       e100_phy_init(nic);
+
        memcpy(netdev->dev_addr, nic->eeprom, ETH_ALEN);
        if(!is_valid_ether_addr(netdev->dev_addr)) {
                DPRINTK(PROBE, ERR, "Invalid MAC address from "