---

yaml --- r: 3585 b: refs/heads/master c: f92d872 h: refs/heads/master i: 3583: 4d0a067 v: v3
git-mirror · Jun 27, 2005 · eb1ddcf · eb1ddcf
1 parent f15ab48
commit eb1ddcf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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 "