summaryrefslogtreecommitdiffstats
path: root/drivers/net/e100.c
diff options
context:
space:
mode:
authorMalli Chilakala <mallikarjuna.chilakala@intel.com>2005-06-17 17:30:22 -0700
committerJeff Garzik <jgarzik@pobox.com>2005-06-27 00:30:23 -0400
commitf92d872876617cddbb0532291034f88941e855fd (patch)
tree6f86b1a29b1476d30cb8bd6fd01869eaac32804e /drivers/net/e100.c
parent648951451e6d2d532d4ace2f8e9c5cdf1d563e83 (diff)
downloadop-kernel-dev-f92d872876617cddbb0532291034f88941e855fd.zip
op-kernel-dev-f92d872876617cddbb0532291034f88941e855fd.tar.gz
[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>
Diffstat (limited to 'drivers/net/e100.c')
-rw-r--r--drivers/net/e100.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 7e46d03..8c7e2d1 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 "
OpenPOWER on IntegriCloud