---

yaml --- r: 290183 b: refs/heads/master c: 150647f h: refs/heads/master i: 290181: bbf111e 290179: 6b68ece 290175: d2438fc v: v3
git-mirror · Feb 16, 2012 · ab62eb6 · ab62eb6
1 parent 4430c02
commit ab62eb6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3acbc9715a5ac8a2534a69eb3488b63b7c9fb1e2
+refs/heads/master: 150647fb2c313d7c5184fca3fa0829a4a7d6f7bc
diff --git a/trunk/drivers/net/ethernet/renesas/sh_eth.c b/trunk/drivers/net/ethernet/renesas/sh_eth.c
@@ -1859,8 +1859,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
 	/* read and set MAC address */
 	read_mac_address(ndev, pd->mac_addr);
 
-	/* First device only init */
-	if (!devno) {
+	/* initialize first or needed device */
+	if (!devno || pd->needs_init) {
 		if (mdp->cd->tsu) {
 			struct resource *rtsu;
 			rtsu = platform_get_resource(pdev, IORESOURCE_MEM, 1);

diff --git a/trunk/include/linux/sh_eth.h b/trunk/include/linux/sh_eth.h
@@ -20,6 +20,7 @@ struct sh_eth_plat_data {
 	unsigned char mac_addr[6];
 	unsigned no_ether_link:1;
 	unsigned ether_link_active_low:1;
+	unsigned needs_init:1;
 };
 
 #endif