From eb1ddcfa111b30d6f547c22b6150e17cafa5dfab Mon Sep 17 00:00:00 2001
From: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date: Fri, 17 Jun 2005 17:30:22 -0700
Subject: [PATCH] --- yaml --- r: 3585 b: refs/heads/master c:
 f92d872876617cddbb0532291034f88941e855fd h: refs/heads/master i:   3583:
 4d0a0672ae8cd55d4dfbba7a47dd31af1eeeae00 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/e100.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2c73cb6234ab..3fbb9b432930 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 648951451e6d2d532d4ace2f8e9c5cdf1d563e83
+refs/heads/master: f92d872876617cddbb0532291034f88941e855fd
diff --git a/trunk/drivers/net/e100.c b/trunk/drivers/net/e100.c
index 7e46d038b9f8..8c7e2d17e75f 100644
--- a/trunk/drivers/net/e100.c
+++ b/trunk/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 "