From: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date: Sat, 18 Jun 2005 00:30:22 +0000 (-0700)
Subject: [PATCH] e100: e100_eeprom_load was called after e100_phy_init
X-Git-Tag: v2.6.13-rc1~51^2~40^2~22
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f92d872876617cddbb0532291034f88941e855fd;p=linux-2.6

[PATCH] e100: e100_eeprom_load was called after e100_phy_init

e100_eeprom_load was called after e100_phy_init causing phy_init
not to use values set in EEPROM - from emann@mrv.com

Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
---

diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 7e46d038b9..8c7e2d17e7 100644
--- 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 "