Skip to content

Commit

Permalink
[PATCH] e100: e100_eeprom_load was called after e100_phy_init
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Malli Chilakala authored and Jeff Garzik committed Jun 27, 2005
1 parent 6489514 commit f92d872
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/e100.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down

0 comments on commit f92d872

Please sign in to comment.